nullworks/doghook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CS?

Browse Source
This commit is contained in:
Alexander German 2018-05-07 19:04:55 +05:00
parent 733717fa03
commit 842fb75e4f
No known key found for this signature in database
GPG Key ID: F0C0568A89EC29F9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/menu.cc
View File

@ -13,13 +13,13 @@
namespace menu { namespace menu {
struct menu_element { struct MenuElement {
bool cat_init; bool cat_init;
bool uncat_enabled; // dirty bool uncat_enabled; // dirty
std::string name; std::string name;
sdk::ConvarType type; sdk::ConvarType type;
sdk::ConvarWrapper *cvar; sdk::ConvarWrapper *cvar;
menu_element(const char *cname, sdk::ConvarType ctype, bool uncat = false) { MenuElement(const char *cname, sdk::ConvarType ctype, bool uncat = false) {
cat_init = uncat; cat_init = uncat;
uncat_enabled = false; uncat_enabled = false;
name = cname; name = cname;
@ -35,7 +35,7 @@ struct menu_element {
}; };
}; };
std::vector<std::deque<menu_element>> to_render; std::vector<std::deque<MenuElement>> to_render;
//std::deque<menu_element> uncat_cvars; //std::deque<menu_element> uncat_cvars;
bool can_draw = false; bool can_draw = false;
@ -45,7 +45,7 @@ void init() {
std::unordered_set<std::string> cat_names; std::unordered_set<std::string> cat_names;
//std::unordered_set<sdk::ConvarWrapper> cvars; //std::unordered_set<sdk::ConvarWrapper> cvars;
std::unordered_map<std::string, std::vector<menu_element>> cat_cvars; std::unordered_map<std::string, std::vector<MenuElement>> cat_cvars;
for (auto c : sdk::ConvarBase::Convar_Range()) { for (auto c : sdk::ConvarBase::Convar_Range()) {
//cvars.insert(sdk::ConvarWrapper(c->name)); //cvars.insert(sdk::ConvarWrapper(c->name));
@ -60,7 +60,7 @@ void init() {
cat_names.insert(cat_name); cat_names.insert(cat_name);
logging::msg("cat_name %s cvar_name %s", cat_name.c_str(), c->name()); logging::msg("cat_name %s cvar_name %s", cat_name.c_str(), c->name());
//cat_cvars[cat_name].push_back(std::make_pair(sdk::ConvarWrapper(c->name), c->name)); //cat_cvars[cat_name].push_back(std::make_pair(sdk::ConvarWrapper(c->name), c->name));
cat_cvars[cat_name].push_back(menu_element(c->name(), c->type())); cat_cvars[cat_name].push_back(MenuElement(c->name(), c->type()));
} else { } else {
//uncat_cvars.push_back(std::make_pair(sdk::ConvarWrapper(c->name), c->name)); //uncat_cvars.push_back(std::make_pair(sdk::ConvarWrapper(c->name), c->name));
//uncat_cvars.push_back(menu_element(c->name(), c->type())); //uncat_cvars.push_back(menu_element(c->name(), c->type()));
@ -76,7 +76,7 @@ void init() {
strcpy(enabled, cat_name.c_str()); strcpy(enabled, cat_name.c_str());
strcat_s(enabled, "_enabled"); strcat_s(enabled, "_enabled");
std::deque<menu_element> tmp; std::deque<MenuElement> tmp;
bool search = true; bool search = true;
@ -93,7 +93,7 @@ void init() {
} }
if (search) if (search)
tmp.push_front(menu_element(cat_name.c_str(), sdk::ConvarType::Bool, true)); tmp.push_front(MenuElement(cat_name.c_str(), sdk::ConvarType::Bool, true));
to_render.push_back(tmp); to_render.push_back(tmp);
} }
@ -121,7 +121,7 @@ void cursor_input(int &cur_pos) {
} }
} }
void cvar_input(menu_element &elem) { void cvar_input(MenuElement &elem) {
static bool was_left = false; static bool was_left = false;
static bool was_right = false; static bool was_right = false;
if (!was_left && IFace<sdk::InputSystem>()->is_button_down(sdk::ButtonCode::KEY_LEFT)) { if (!was_left && IFace<sdk::InputSystem>()->is_button_down(sdk::ButtonCode::KEY_LEFT)) {
@ -175,7 +175,7 @@ bool is_visible() {
return visible; return visible;
} }
void draw_elem(const sdk::draw::FontHandle &font, sdk::draw::Color &color, const math::Vector &render, const menu_element &elem) { void draw_elem(const sdk::draw::FontHandle &font, sdk::draw::Color &color, const math::Vector &render, const MenuElement &elem) {
switch (elem.type) { switch (elem.type) {
case sdk::ConvarType::Bool: case sdk::ConvarType::Bool:
sdk::draw::text(font, color, render, " %s: %s", elem.name.c_str(), elem.cvar->get_bool() ? "Enabled" : "Disabled"); sdk::draw::text(font, color, render, " %s: %s", elem.name.c_str(), elem.cvar->get_bool() ? "Enabled" : "Disabled");