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

Merge pull request #593 from LightyPon/patch-1

Browse Source 
Fix WTS not working after map change
This commit is contained in:
LightCat 2018-10-05 18:36:54 +02:00 committed by GitHub
commit 9aec597624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/hooks/visual/PaintTraverse.cpp
View File

@ -40,14 +40,11 @@ DEFINE_HOOKED_METHOD(PaintTraverse, void, vgui::IPanel *this_,
unsigned int panel, bool force, bool allow_force) unsigned int panel, bool force, bool allow_force)
{ {
static bool textures_loaded = false; static bool textures_loaded = false;
static unsigned long panel_focus = 0;
static unsigned long panel_scope = 0; static unsigned long panel_scope = 0;
static unsigned long panel_top = 0;
static bool cur, draw_flag = false;
static bool call_default = true; static bool call_default = true;
static bool cur;
static ConVar *software_cursor = g_ICvar->FindVar("cl_software_cursor"); static ConVar *software_cursor = g_ICvar->FindVar("cl_software_cursor");
static const char *name; static const char *name;
static std::string name_s, name_stripped, reason_stripped;
#if ENABLE_VISUALS #if ENABLE_VISUALS
if (!textures_loaded) if (!textures_loaded)
@ -175,33 +172,6 @@ DEFINE_HOOKED_METHOD(PaintTraverse, void, vgui::IPanel *this_,
original::PaintTraverse(this_, panel, force, allow_force); original::PaintTraverse(this_, panel, force, allow_force);
// To avoid threading problems. // To avoid threading problems.
if (panel == panel_top)
draw_flag = true;
if (!isHackActive())
return;
if (!panel_top)
{
name = g_IPanel->GetName(panel);
if (strlen(name) > 4)
{
if (name[0] == 'M' && name[3] == 'S')
{
panel_top = panel;
}
}
}
if (!panel_focus)
{
name = g_IPanel->GetName(panel);
if (strlen(name) > 5)
{
if (name[0] == 'F' && name[5] == 'O')
{
panel_focus = panel;
}
}
}
if (!panel_scope) if (!panel_scope)
{ {
name = g_IPanel->GetName(panel); name = g_IPanel->GetName(panel);
@ -215,13 +185,6 @@ DEFINE_HOOKED_METHOD(PaintTraverse, void, vgui::IPanel *this_,
g_Settings.bInvalid = true; g_Settings.bInvalid = true;
} }
if (panel != panel_focus)
return;
g_IPanel->SetTopmostPopup(panel_focus, true);
if (!draw_flag)
return;
draw_flag = false;
if (disable_visuals) if (disable_visuals)
return; return;