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

Cstrike: Add support for monster_scientist entity (alias of hostage_entity)

Browse Source
This commit is contained in:
Arkshine 2015-07-04 16:36:28 +02:00
parent 27d6a0cc08
commit d9a9b7a74e
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/cstrike/cstrike/CstrikeNatives.cpp
View File

@ -127,11 +127,7 @@ static cell AMX_NATIVE_CALL cs_get_hostage_id(AMX *amx, cell *params)
CHECK_NONPLAYER(index); CHECK_NONPLAYER(index);
edict_t *pHostage = INDEXENT(index); edict_t *pHostage = INDEXENT(index);
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
return get_pdata<int>(pHostage, m_iHostageIndex); return get_pdata<int>(pHostage, m_iHostageIndex);
} }
@ -860,11 +856,7 @@ static cell AMX_NATIVE_CALL cs_get_hostage_follow(AMX *amx, cell *params)
CHECK_NONPLAYER(index); CHECK_NONPLAYER(index);
edict_t* pHostage = INDEXENT(index); edict_t* pHostage = INDEXENT(index);
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
edict_t *pEntity = get_pdata<EHANDLE>(pHostage, m_hTargetEnt).Get(); edict_t *pEntity = get_pdata<EHANDLE>(pHostage, m_hTargetEnt).Get();
@ -887,11 +879,7 @@ static cell AMX_NATIVE_CALL cs_set_hostage_follow(AMX *amx, cell *params)
CHECK_ENTITY(target); CHECK_ENTITY(target);
} }
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
get_pdata<EHANDLE>(pHostage, m_hTargetEnt).Set(target ? GETEDICT(target) : nullptr); get_pdata<EHANDLE>(pHostage, m_hTargetEnt).Set(target ? GETEDICT(target) : nullptr);
@ -1383,11 +1371,7 @@ static cell AMX_NATIVE_CALL cs_get_hostage_lastuse(AMX *amx, cell *params)
CHECK_NONPLAYER(index); CHECK_NONPLAYER(index);
edict_t *pHostage = INDEXENT(index); edict_t *pHostage = INDEXENT(index);
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
return amx_ftoc(get_pdata<float>(pHostage, m_flPathAcquired)); return amx_ftoc(get_pdata<float>(pHostage, m_flPathAcquired));
} }
@ -1402,11 +1386,7 @@ static cell AMX_NATIVE_CALL cs_set_hostage_lastuse(AMX *amx, cell *params)
CHECK_NONPLAYER(index); CHECK_NONPLAYER(index);
edict_t *pHostage = INDEXENT(index); edict_t *pHostage = INDEXENT(index);
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
set_pdata<float>(pHostage, m_flPathAcquired, amx_ctof(params[2])); set_pdata<float>(pHostage, m_flPathAcquired, amx_ctof(params[2]));
@ -1423,11 +1403,7 @@ static cell AMX_NATIVE_CALL cs_get_hostage_nextuse(AMX* amx, cell* params)
CHECK_NONPLAYER(index); CHECK_NONPLAYER(index);
edict_t *pHostage = INDEXENT(index); edict_t *pHostage = INDEXENT(index);
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
return amx_ftoc(get_pdata<float>(pHostage, m_flNextChange)); return amx_ftoc(get_pdata<float>(pHostage, m_flNextChange));
} }
@ -1442,11 +1418,7 @@ static cell AMX_NATIVE_CALL cs_set_hostage_nextuse(AMX* amx, cell* params)
CHECK_NONPLAYER(index); CHECK_NONPLAYER(index);
edict_t *pHostage = INDEXENT(index); edict_t *pHostage = INDEXENT(index);
if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) CHECK_HOSTAGE(pHostage);
{
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(pHostage->v.classname));
return 0;
}
set_pdata<float>(pHostage, m_flNextChange, amx_ctof(params[2])); set_pdata<float>(pHostage, m_flNextChange, amx_ctof(params[2]));

7
modules/cstrike/cstrike/CstrikeUtils.h
View File

@ -63,6 +63,13 @@ bool UTIL_CheckForPublic(const char *publicname);
} \ } \
} }
#define CHECK_HOSTAGE(x) \
if (strcmp(STRING(x->v.classname), "hostage_entity") != 0 && strcmp(STRING(x->v.classname), "monster_scientist") != 0) \
{ \
MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", index, STRING(x->v.classname)); \
return 0; \
}
#define GETEDICT(n) \ #define GETEDICT(n) \
((n >= 1 && n <= gpGlobals->maxClients) ? MF_GetPlayerEdict(n) : INDEXENT(n)) ((n >= 1 && n <= gpGlobals->maxClients) ? MF_GetPlayerEdict(n) : INDEXENT(n))