From c7febb4447c9aa65569c7d8f876f94e79261471a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 10 Sep 2006 03:01:21 +0000 Subject: [PATCH] fix for issue am44593 --- dlls/cstrike/amxxmodule.cpp | 2 +- dlls/cstrike/cstrike.cpp | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/cstrike/amxxmodule.cpp b/dlls/cstrike/amxxmodule.cpp index 30ef9c79..d8c8c56c 100755 --- a/dlls/cstrike/amxxmodule.cpp +++ b/dlls/cstrike/amxxmodule.cpp @@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindLibrary(NULL, LibType_Class); MF_AddLibraries(NULL, LibType_Class, NULL); MF_RemoveLibraries(NULL); - MF_OverrideNatives(NULL); + MF_OverrideNatives(NULL, ""); } #endif diff --git a/dlls/cstrike/cstrike.cpp b/dlls/cstrike/cstrike.cpp index 0962b3e7..dd9c8ce5 100755 --- a/dlls/cstrike/cstrike.cpp +++ b/dlls/cstrike/cstrike.cpp @@ -728,20 +728,27 @@ static cell AMX_NATIVE_CALL cs_set_user_defusekit(AMX *amx, cell *params) // cs_ int* defusekit = ((int *)pPlayer->pvPrivateData + OFFSET_DEFUSE_PLANT); - if (params[2]) { + if (params[2]) + { int colour[3] = {DEFUSER_COLOUR_R, DEFUSER_COLOUR_G, DEFUSER_COLOUR_B}; - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) + { if (params[i + 3] != -1) + { colour[i] = params[i + 3]; + } } + pPlayer->v.body = 1; + char* icon; - if (params[6] != -1) { + if (params[6] != -1) + { int len; icon = MF_GetAmxString(amx, params[6], 1, &len); - } - else + } else { icon = "defuser"; + } *defusekit |= HAS_DEFUSE_KIT; MESSAGE_BEGIN(MSG_ONE, GET_USER_MSG_ID(PLID, "StatusIcon", NULL), NULL, pPlayer); @@ -758,6 +765,7 @@ static cell AMX_NATIVE_CALL cs_set_user_defusekit(AMX *amx, cell *params) // cs_ WRITE_BYTE(0); // hide WRITE_STRING("defuser"); MESSAGE_END(); + pPlayer->v.body = 0; } /*