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

Merge pull request #380 from mrsteyk/patch-1

Browse Source 
Dirty clang fix
This commit is contained in:
BenCat07 2018-04-15 14:44:31 +02:00 committed by GitHub
commit c23a5bcf05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hooks/others.cpp
View File

@ -1024,8 +1024,13 @@ void LevelInit_hook(void *_this, const char *newmap)
gSignatures.GetEngineSignature("55 89 E5 57 31 FF 56 8D B5 ? ? ? ? 53 " gSignatures.GetEngineSignature("55 89 E5 57 31 FF 56 8D B5 ? ? ? ? 53 "
"81 EC ? ? ? ? C7 85 ? ? ? ? ? ? ? ?"); "81 EC ? ? ? ? C7 85 ? ? ? ? ? ? ? ?");
static LoadNamedSkys_Fn LoadNamedSkys = LoadNamedSkys_Fn(addr); static LoadNamedSkys_Fn LoadNamedSkys = LoadNamedSkys_Fn(addr);
LoadNamedSkys(skynum[(int) skybox_changer]); bool succ;
logging::Info("Loading Skybox..."); #ifdef __clang__
asm ("movl %1, %%edi; push skynum[(int) skybox_changer]; call %%edi; mov %%eax, %0; add %%esp, 4h" :"=r"(succ) :"r"(LoadNamedSkys));
#else
succ = LoadNamedSkys(skynum[(int) skybox_changer]);
#endif
logging::Info("Loaded Skybox: %s" succ ? "true" : "false");
ConVar *holiday = g_ICvar->FindVar("tf_forced_holiday"); ConVar *holiday = g_ICvar->FindVar("tf_forced_holiday");
if (halloween_mode) if (halloween_mode)
holiday->SetValue(2); holiday->SetValue(2);