From 67fbc5661876cebecc83ff9fb09a1fc53475a09c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 29 Jun 2004 03:22:38 +0000 Subject: [PATCH] Added Vexd Compatibility back in. --- dlls/engine/amxxapi.cpp | 2 ++ dlls/engine/engine.h | 2 ++ dlls/engine/forwards.cpp | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/dlls/engine/amxxapi.cpp b/dlls/engine/amxxapi.cpp index 8d9651ab..2530f458 100755 --- a/dlls/engine/amxxapi.cpp +++ b/dlls/engine/amxxapi.cpp @@ -45,6 +45,8 @@ void OnPluginsLoaded() SpawnForward = MF_RegisterForward("pfn_spawn", ET_IGNORE, FP_CELL, FP_DONE); DispatchUseForward = MF_RegisterForward("pfn_use", ET_STOP, FP_CELL, FP_CELL, FP_DONE); pfnTouchForward = MF_RegisterForward("pfn_touch", ET_STOP, FP_CELL, FP_CELL, FP_DONE); + VexdTouchForward = MF_RegisterForward("vexd_pfntouch", ET_IGNORE, FP_CELL, FP_CELL, FP_DONE); + VexdServerForward = MF_RegisterForward("ServerFrame", ET_IGNORE, FP_DONE); } qboolean Voice_SetClientListening(int iReceiver, int iSender, qboolean bListen) diff --git a/dlls/engine/engine.h b/dlls/engine/engine.h index a6bbcb57..9bd80a08 100755 --- a/dlls/engine/engine.h +++ b/dlls/engine/engine.h @@ -32,6 +32,8 @@ extern int ClientKillForward; extern int CmdStartForward; extern int StartFrameForward; extern int DispatchUseForward; +extern int VexdTouchForward; +extern int VexdServerForward; #define AMS_OFFSET 0.01 diff --git a/dlls/engine/forwards.cpp b/dlls/engine/forwards.cpp index 39b7fcf1..2d63fc07 100755 --- a/dlls/engine/forwards.cpp +++ b/dlls/engine/forwards.cpp @@ -13,6 +13,8 @@ int PlayerPostThinkForward = 0; int ClientKillForward = 0; int CmdStartForward = 0; int StartFrameForward = 0; +int VexdTouchForward = 0; +int VexdServerForward = 0; std::vector Impulses; std::vector Thinks; std::vector Uses; @@ -125,6 +127,8 @@ void StartFrame_Post() if (StartFrameForward) MF_ExecuteForward(StartFrameForward); + else if (VexdServerForward) + MF_ExecuteForward(VexdServerForward); RETURN_META(MRES_IGNORED); } @@ -269,6 +273,10 @@ void DispatchTouch(edict_t *pToucher, edict_t *pTouched) retVal = MF_ExecuteForward(pfnTouchForward, ENTINDEX(pToucher), ENTINDEX(pTouched)); if (retVal) RETURN_META(MRES_SUPERCEDE); + } else if (VexdTouchForward) { + retVal = MF_ExecuteForward(VexdTouchForward, ENTINDEX(pToucher), ENTINDEX(pTouched)); + if (retVal) + RETURN_META(MRES_SUPERCEDE); } RETURN_META(MRES_IGNORED);