Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for issue am44593

Browse Source
This commit is contained in:
David Anderson 2006-09-10 03:01:21 +00:00
parent 77e4d85002
commit c7febb4447
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/cstrike/amxxmodule.cpp
View File

@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
MF_FindLibrary(NULL, LibType_Class); MF_FindLibrary(NULL, LibType_Class);
MF_AddLibraries(NULL, LibType_Class, NULL); MF_AddLibraries(NULL, LibType_Class, NULL);
MF_RemoveLibraries(NULL); MF_RemoveLibraries(NULL);
MF_OverrideNatives(NULL); MF_OverrideNatives(NULL, "");
} }
#endif #endif

18
dlls/cstrike/cstrike.cpp
View File

@ -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); 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}; 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) if (params[i + 3] != -1)
{
colour[i] = params[i + 3]; colour[i] = params[i + 3];
}
} }
pPlayer->v.body = 1;
char* icon; char* icon;
if (params[6] != -1) { if (params[6] != -1)
{
int len; int len;
icon = MF_GetAmxString(amx, params[6], 1, &len); icon = MF_GetAmxString(amx, params[6], 1, &len);
} } else {
else
icon = "defuser"; icon = "defuser";
}
*defusekit |= HAS_DEFUSE_KIT; *defusekit |= HAS_DEFUSE_KIT;
MESSAGE_BEGIN(MSG_ONE, GET_USER_MSG_ID(PLID, "StatusIcon", NULL), NULL, pPlayer); 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_BYTE(0); // hide
WRITE_STRING("defuser"); WRITE_STRING("defuser");
MESSAGE_END(); MESSAGE_END();
pPlayer->v.body = 0;
} }
/* /*