UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TF2 GetHoliday detour now detours UTIL_GetHoliday (bug 4700, r=fyren).

Browse Source
This commit is contained in:
Nicholas Hastings 2010-11-09 21:12:38 -05:00
parent 7627bf80b9
commit ac738aff10
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/tf2/holiday.cpp
View File

@ -35,9 +35,9 @@ CDetour *getHolidayDetour = NULL;
IForward *g_getHolidayForward = NULL; IForward *g_getHolidayForward = NULL;
DETOUR_DECL_MEMBER0(GetHoliday, int) DETOUR_DECL_STATIC0(GetHoliday, int)
{ {
int actualres = DETOUR_MEMBER_CALL(GetHoliday)(); int actualres = DETOUR_STATIC_CALL(GetHoliday)();
if (!g_getHolidayForward) if (!g_getHolidayForward)
{ {
g_pSM->LogMessage(myself, "Invalid Forward"); g_pSM->LogMessage(myself, "Invalid Forward");
@ -60,7 +60,7 @@ DETOUR_DECL_MEMBER0(GetHoliday, int)
void InitialiseGetHolidayDetour() void InitialiseGetHolidayDetour()
{ {
getHolidayDetour = DETOUR_CREATE_MEMBER(GetHoliday, "GetHoliday"); getHolidayDetour = DETOUR_CREATE_STATIC(GetHoliday, "GetHoliday");
if (!getHolidayDetour) if (!getHolidayDetour)
{ {

6
gamedata/sm-tf2.games.txt
View File

@ -95,9 +95,9 @@
"GetHoliday" "GetHoliday"
{ {
"library" "server" "library" "server"
"windows" "\x81\xEC\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x83\x2A\x2A\x2A\x56\x8B\xF1\x89\x2A\x2A\x2A\x74\x2A\xB8" "windows" "\x81\xEC\x2A\x2A\x2A\x2A\x53\x55\x56\x57\x6A\x00\xE8\xF5"
"linux" "@_ZN12CTFGameRules10GetHolidayEv" "linux" "@_Z15UTIL_GetHolidayv"
"mac" "@_ZN12CTFGameRules10GetHolidayEv" "mac" "@_Z15UTIL_GetHolidayv"
} }
"MakeBleed" "MakeBleed"
{ {