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

Fixed amb116 - DispatchKeyValue didn't work with worldspawn (entity 0)

Browse Source
This commit is contained in:
Scott Ehlert 2007-04-28 16:19:04 +00:00
parent 710cd548a9
commit fd8489d088
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/engine/entity.cpp
View File

@ -130,29 +130,38 @@ static cell AMX_NATIVE_CALL is_valid_ent(AMX *amx, cell *params)
//uses mahnsawce's version now //uses mahnsawce's version now
static cell AMX_NATIVE_CALL DispatchKeyValue(AMX *amx, cell *params) static cell AMX_NATIVE_CALL DispatchKeyValue(AMX *amx, cell *params)
{ {
int count = *params/sizeof(cell); int count = *params / sizeof(cell);
if (count == 3) {
if (count == 3)
{
cell *cVal = MF_GetAmxAddr(amx, params[1]); cell *cVal = MF_GetAmxAddr(amx, params[1]);
int iValue = *cVal; int iValue = *cVal;
CHECK_ENTITY(iValue);
if (iValue != 0 && (FNullEnt(INDEXENT2(iValue)) || iValue < 0 || iValue > gpGlobals->maxEntities))
{
MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d", iValue);
return 0;
}
edict_t *pEntity = INDEXENT2(iValue); edict_t *pEntity = INDEXENT2(iValue);
KeyValueData kvd; KeyValueData kvd;
int iLength=0; int iLength=0;
char *char1 = MF_GetAmxString(amx, params[2], 0, &iLength); char *char1 = MF_GetAmxString(amx, params[2], 0, &iLength);
char *char2 = MF_GetAmxString(amx, params[3], 1, &iLength); char *char2 = MF_GetAmxString(amx, params[3], 1, &iLength);
kvd.szClassName = (char*)STRING(pEntity->v.classname); kvd.szClassName = (char*)STRING(pEntity->v.classname);
kvd.szKeyName = char1; kvd.szKeyName = char1;
kvd.szValue = char2; kvd.szValue = char2;
kvd.fHandled = 0; kvd.fHandled = 0;
MDLL_KeyValue(pEntity, &kvd); MDLL_KeyValue(pEntity, &kvd);
} } else {
else
{
int iLength; int iLength;
char *char1 = MF_GetAmxString(amx, params[1], 0, &iLength); char *char1 = MF_GetAmxString(amx, params[1], 0, &iLength);
char *char2 = MF_GetAmxString(amx, params[2], 1, &iLength); char *char2 = MF_GetAmxString(amx, params[2], 1, &iLength);
const char *charA = STRING(ALLOC_STRING(char1)); const char *charA = STRING(ALLOC_STRING(char1));
const char *charB = STRING(ALLOC_STRING(char2)); const char *charB = STRING(ALLOC_STRING(char2));
g_pkvd->szKeyName = const_cast<char *>(charA); g_pkvd->szKeyName = const_cast<char *>(charA);
g_pkvd->szValue = const_cast<char *>(charB); g_pkvd->szValue = const_cast<char *>(charB);
} }