From 94cd377291a09da46e2753767fd337568b636b2c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 5 Feb 2004 07:08:11 +0000 Subject: [PATCH] Fixed some bugs, got windows compile. --- dlls/engine/meta_api.cpp | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/engine/meta_api.cpp b/dlls/engine/meta_api.cpp index 59af4cce..755c316b 100755 --- a/dlls/engine/meta_api.cpp +++ b/dlls/engine/meta_api.cpp @@ -2379,6 +2379,13 @@ static cell AMX_NATIVE_CALL GetSpeak(AMX *amx, cell *params) { return PlInfo[iIndex].iSpeakFlags; } +/*//SetPhysicsKey, sets a physics key. +//(BAILOPAN) +static cell AMX_NATIVE_CALL set_user_physics(AMX *amx, cell *params) +{ + int iKey; +}*/ + // SetLights, this sets the lights for the map. static cell AMX_NATIVE_CALL SetLights(AMX *amx, cell *params) { int iLength; @@ -2581,12 +2588,20 @@ void Touch(edict_t *pToucher, edict_t *pTouched) { //Added by BAILOPAN. ClientKill() forward. void ClientKill(edict_t *pEntity) { - for(std::vector::iterator i = vCliKillList.begin(); i != vCliKillList.end(); i++) { - cell iRetVal = 0; - AMX_EXEC(&i->pPlugin->amx, &iRetVal, i->iFunctionIdx, 1, ENTINDEX(pEntity)); - } + cell iRetVal = 0; + META_RES result = MRES_IGNORED; - RETURN_META(MRES_IGNORED); + for(std::vector::iterator i = vCliKillList.begin(); i != vCliKillList.end(); i++) { + AMX_EXEC(&i->pPlugin->amx, &iRetVal, i->iFunctionIdx, 1, ENTINDEX(pEntity)); + if (iRetVal & 2) { + RETURN_META(MRES_SUPERCEDE); + } + if (iRetVal & 1) { + result = MRES_SUPERCEDE; + } + } + + RETURN_META(result); } // ClientDisconnect. Reinitialize the PlayerInfo struct for that player. @@ -3012,4 +3027,4 @@ C_DLLEXPORT int AMX_Attach(module_info_s** info,pfnamx_engine_g* amxeng,pfnms_en C_DLLEXPORT int AMX_Detach() { return(1); -} +} \ No newline at end of file