diff --git a/extensions/tf2/holiday.cpp b/extensions/tf2/holiday.cpp index 12ee8e43..549d2d3c 100644 --- a/extensions/tf2/holiday.cpp +++ b/extensions/tf2/holiday.cpp @@ -35,9 +35,9 @@ CDetour *getHolidayDetour = 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) { g_pSM->LogMessage(myself, "Invalid Forward"); @@ -60,7 +60,7 @@ DETOUR_DECL_MEMBER0(GetHoliday, int) void InitialiseGetHolidayDetour() { - getHolidayDetour = DETOUR_CREATE_MEMBER(GetHoliday, "GetHoliday"); + getHolidayDetour = DETOUR_CREATE_STATIC(GetHoliday, "GetHoliday"); if (!getHolidayDetour) { diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt index d0c8304d..08133dd6 100644 --- a/gamedata/sm-tf2.games.txt +++ b/gamedata/sm-tf2.games.txt @@ -95,9 +95,9 @@ "GetHoliday" { "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" - "linux" "@_ZN12CTFGameRules10GetHolidayEv" - "mac" "@_ZN12CTFGameRules10GetHolidayEv" + "windows" "\x81\xEC\x2A\x2A\x2A\x2A\x53\x55\x56\x57\x6A\x00\xE8\xF5" + "linux" "@_Z15UTIL_GetHolidayv" + "mac" "@_Z15UTIL_GetHolidayv" } "MakeBleed" {