TF2 GetHoliday detour now detours UTIL_GetHoliday (bug 4700, r=fyren).
TF2 GetHoliday detour now detours UTIL_GetHoliday (
bug 4700, r=fyren).
1.1 --- a/extensions/tf2/holiday.cpp Sun Nov 07 19:05:32 2010 -0500
1.2 +++ b/extensions/tf2/holiday.cpp Tue Nov 09 21:12:38 2010 -0500
1.3 @@ -35,9 +35,9 @@
1.4
1.5 IForward *g_getHolidayForward = NULL;
1.6
1.7 -DETOUR_DECL_MEMBER0(GetHoliday, int)
1.8 +DETOUR_DECL_STATIC0(GetHoliday, int)
1.9 {
1.10 - int actualres = DETOUR_MEMBER_CALL(GetHoliday)();
1.11 + int actualres = DETOUR_STATIC_CALL(GetHoliday)();
1.12 if (!g_getHolidayForward)
1.13 {
1.14 g_pSM->LogMessage(myself, "Invalid Forward");
1.15 @@ -60,7 +60,7 @@
1.16
1.17 void InitialiseGetHolidayDetour()
1.18 {
1.19 - getHolidayDetour = DETOUR_CREATE_MEMBER(GetHoliday, "GetHoliday");
1.20 + getHolidayDetour = DETOUR_CREATE_STATIC(GetHoliday, "GetHoliday");
1.21
1.22 if (!getHolidayDetour)
1.23 {
2.1 --- a/gamedata/sm-tf2.games.txt Sun Nov 07 19:05:32 2010 -0500
2.2 +++ b/gamedata/sm-tf2.games.txt Tue Nov 09 21:12:38 2010 -0500
2.3 @@ -95,9 +95,9 @@
2.4 "GetHoliday"
2.5 {
2.6 "library" "server"
2.7 - "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"
2.8 - "linux" "@_ZN12CTFGameRules10GetHolidayEv"
2.9 - "mac" "@_ZN12CTFGameRules10GetHolidayEv"
2.10 + "windows" "\x81\xEC\x2A\x2A\x2A\x2A\x53\x55\x56\x57\x6A\x00\xE8\xF5"
2.11 + "linux" "@_Z15UTIL_GetHolidayv"
2.12 + "mac" "@_Z15UTIL_GetHolidayv"
2.13 }
2.14 "MakeBleed"
2.15 {