From 77dc5ac7ed0e6147dfe35ad52a02b4d060e97f76 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Tue, 14 Oct 2014 17:47:44 -0400 Subject: [PATCH] Fix build. --- extensions/sdkhooks/extension.cpp | 18 +++++++++--------- extensions/sdkhooks/extension.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extensions/sdkhooks/extension.cpp b/extensions/sdkhooks/extension.cpp index e5b05593..d24c1527 100644 --- a/extensions/sdkhooks/extension.cpp +++ b/extensions/sdkhooks/extension.cpp @@ -170,7 +170,7 @@ SH_DECL_MANUALHOOK0(GetMaxHealth, 0, 0, 0, int); #endif SH_DECL_MANUALHOOK1_void(GroundEntChanged, 0, 0, 0, void *); SH_DECL_MANUALHOOK1(OnTakeDamage, 0, 0, 0, int, CTakeDamageInfoHack &); -SH_DECL_MANUALHOOK1(OnTakeDamageAlive, 0, 0, 0, int, CTakeDamageInfoHack &); +SH_DECL_MANUALHOOK1(OnTakeDamage_Alive, 0, 0, 0, int, CTakeDamageInfoHack &); SH_DECL_MANUALHOOK0_void(PreThink, 0, 0, 0); SH_DECL_MANUALHOOK0_void(PostThink, 0, 0, 0); SH_DECL_MANUALHOOK0(Reload, 0, 0, 0, bool); @@ -611,11 +611,11 @@ HookReturn SDKHooks::Hook(int entity, SDKHookType type, IPluginFunction *callbac case SDKHook_OnTakeDamagePost: hookid = SH_ADD_MANUALVPHOOK(OnTakeDamage, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_OnTakeDamagePost), true); break; - case SDKHook_OnTakeDamageAlive: - hookid = SH_ADD_MANUALVPHOOK(OnTakeDamageAlive, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_OnTakeDamageAlive), false); + case SDKHook_OnTakeDamage_Alive: + hookid = SH_ADD_MANUALVPHOOK(OnTakeDamage_Alive, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_OnTakeDamage_Alive), false); break; - case SDKHook_OnTakeDamageAlivePost: - hookid = SH_ADD_MANUALVPHOOK(OnTakeDamageAlive, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_OnTakeDamageAlivePost), true); + case SDKHook_OnTakeDamage_AlivePost: + hookid = SH_ADD_MANUALVPHOOK(OnTakeDamage_Alive, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_OnTakeDamage_AlivePost), true); break; case SDKHook_PreThink: hookid = SH_ADD_MANUALVPHOOK(PreThink, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_PreThink), false); @@ -1156,14 +1156,14 @@ int SDKHooks::Hook_OnTakeDamagePost(CTakeDamageInfoHack &info) return HandleOnTakeDamageHookPost(info, SDKHook_OnTakeDamagePost); } -int SDKHooks::Hook_OnTakeDamageAlive(CTakeDamageInfoHack &info) +int SDKHooks::Hook_OnTakeDamage_Alive(CTakeDamageInfoHack &info) { - return HandleOnTakeDamageHook(info, SDKHook_OnTakeDamageAlive); + return HandleOnTakeDamageHook(info, SDKHook_OnTakeDamage_Alive); } -int SDKHooks::Hook_OnTakeDamageAlivePost(CTakeDamageInfoHack &info) +int SDKHooks::Hook_OnTakeDamage_AlivePost(CTakeDamageInfoHack &info) { - return HandleOnTakeDamageHookPost(info, SDKHook_OnTakeDamageAlivePost); + return HandleOnTakeDamageHookPost(info, SDKHook_OnTakeDamage_AlivePost); } void SDKHooks::Hook_PreThink() diff --git a/extensions/sdkhooks/extension.h b/extensions/sdkhooks/extension.h index 50f2116b..f1e1b297 100644 --- a/extensions/sdkhooks/extension.h +++ b/extensions/sdkhooks/extension.h @@ -90,8 +90,8 @@ enum SDKHookType SDKHook_GetMaxHealth, SDKHook_Blocked, SDKHook_BlockedPost, - SDKHook_OnTakeDamageAlive, - SDKHook_OnTakeDamageAlivePost, + SDKHook_OnTakeDamage_Alive, + SDKHook_OnTakeDamage_AlivePost, SDKHook_MAXHOOKS }; @@ -290,8 +290,8 @@ public: void Hook_GroundEntChangedPost(void *pVar); int Hook_OnTakeDamage(CTakeDamageInfoHack &info); int Hook_OnTakeDamagePost(CTakeDamageInfoHack &info); - int Hook_OnTakeDamageAlive(CTakeDamageInfoHack &info); - int Hook_OnTakeDamageAlivePost(CTakeDamageInfoHack &info); + int Hook_OnTakeDamage_Alive(CTakeDamageInfoHack &info); + int Hook_OnTakeDamage_AlivePost(CTakeDamageInfoHack &info); void Hook_PreThink(); void Hook_PreThinkPost(); void Hook_PostThink();