From 93ce1ac4705c8325fa1daf2840404fad38f3df40 Mon Sep 17 00:00:00 2001 From: Borja Ferrer Date: Mon, 23 Jan 2006 07:27:58 +0000 Subject: [PATCH] fixed a forward bug causing client_death to pass weapindex as the damage --- dlls/tfc/tfcx/NRank.cpp | 2 +- dlls/tfc/tfcx/moduleconfig.cpp | 2 +- dlls/tfc/tfcx/usermsg.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/tfc/tfcx/NRank.cpp b/dlls/tfc/tfcx/NRank.cpp index c8922151..2c57ebf5 100755 --- a/dlls/tfc/tfcx/NRank.cpp +++ b/dlls/tfc/tfcx/NRank.cpp @@ -293,7 +293,7 @@ static cell AMX_NATIVE_CALL cwpn_dmg(AMX *amx, cell *params){ // wid,att,vic,dmg return 1; pAtt->saveKill(pVic,weapon,( aim == 1 ) ? 1:0 ,TA); - MF_ExecuteForward(g_death_info, pAtt->index, pVic->index, dmg, weapon, aim, TA); + MF_ExecuteForward(g_death_info, pAtt->index, pVic->index, weapon, aim, TA); return 1; } diff --git a/dlls/tfc/tfcx/moduleconfig.cpp b/dlls/tfc/tfcx/moduleconfig.cpp index 4c25fac9..7751ae8a 100755 --- a/dlls/tfc/tfcx/moduleconfig.cpp +++ b/dlls/tfc/tfcx/moduleconfig.cpp @@ -354,5 +354,5 @@ void OnAmxxAttach() { void OnPluginsLoaded() { g_damage_info = MF_RegisterForward("client_damage", ET_IGNORE, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE); - g_death_info = MF_RegisterForward("client_death", ET_IGNORE, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE); + g_death_info = MF_RegisterForward("client_death", ET_IGNORE, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE); } \ No newline at end of file diff --git a/dlls/tfc/tfcx/usermsg.cpp b/dlls/tfc/tfcx/usermsg.cpp index 555577e0..be90f71b 100755 --- a/dlls/tfc/tfcx/usermsg.cpp +++ b/dlls/tfc/tfcx/usermsg.cpp @@ -232,7 +232,7 @@ void Client_Damage_End(void* mValue){ pAttacker->saveKill(mPlayer,weapon,( aim == 1 ) ? 1:0 ,TA); if (g_death_info > 0) - MF_ExecuteForward(g_death_info, pAttacker->index, mPlayer->index, damage, weapon, aim, TA); + MF_ExecuteForward(g_death_info, pAttacker->index, mPlayer->index, weapon, aim, TA); } }