GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 06:15:37 +03:00
Code Issues Projects Releases Wiki Activity

Fixed amb230 - radius_damage didn't completely kill players on some mods

Browse Source
This commit is contained in:
Scott Ehlert 2007-04-25 18:13:16 +00:00
parent 74c6290dc0
commit fc2b220c38
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dlls/engine/engine.cpp
View File

@ -136,12 +136,15 @@ static cell AMX_NATIVE_CALL RadiusDamage_AMXModX(AMX *amx, cell *params)
Vector vOrigin = Vector(fCurrentX, fCurrentY, fCurrentZ); Vector vOrigin = Vector(fCurrentX, fCurrentY, fCurrentZ);
edict_t *pSearchEnt = NULL; edict_t *pSearchEnt = NULL;
while((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 5 * iRadiusMultiplier)) != NULL) { while ((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 5 * iRadiusMultiplier)) != NULL)
if(FStrEq(STRING(pSearchEnt->v.classname), "player")) { {
if(pSearchEnt->v.takedamage != DAMAGE_NO) { if (FStrEq(STRING(pSearchEnt->v.classname), "player"))
pSearchEnt->v.health -= 10 + RANDOM_FLOAT(0,1 * iDamageMultiplier); {
if(pSearchEnt->v.health < 1) { if (pSearchEnt->v.takedamage != DAMAGE_NO)
pSearchEnt->v.health = 1; {
pSearchEnt->v.health -= 10 + RANDOM_FLOAT(0, 1 * iDamageMultiplier);
if (pSearchEnt->v.health < 1)
{
MDLL_ClientKill(pSearchEnt); MDLL_ClientKill(pSearchEnt);
} }
} }
@ -150,12 +153,15 @@ static cell AMX_NATIVE_CALL RadiusDamage_AMXModX(AMX *amx, cell *params)
pSearchEnt = NULL; pSearchEnt = NULL;
while((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 4 * iRadiusMultiplier)) != NULL) { while ((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 4 * iRadiusMultiplier)) != NULL)
if(FStrEq(STRING(pSearchEnt->v.classname), "player")) { {
if(pSearchEnt->v.takedamage != DAMAGE_NO) { if (FStrEq(STRING(pSearchEnt->v.classname), "player"))
pSearchEnt->v.health -= 25 + RANDOM_FLOAT(0,2 * iDamageMultiplier); {
if(pSearchEnt->v.health < 1) { if (pSearchEnt->v.takedamage != DAMAGE_NO)
pSearchEnt->v.health = 1; {
pSearchEnt->v.health -= 25 + RANDOM_FLOAT(0, 2 * iDamageMultiplier);
if (pSearchEnt->v.health < 1)
{
MDLL_ClientKill(pSearchEnt); MDLL_ClientKill(pSearchEnt);
} }
} }
@ -164,12 +170,15 @@ static cell AMX_NATIVE_CALL RadiusDamage_AMXModX(AMX *amx, cell *params)
pSearchEnt = NULL; pSearchEnt = NULL;
while((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 3 * iRadiusMultiplier)) != NULL) { while ((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 3 * iRadiusMultiplier)) != NULL)
if(FStrEq(STRING(pSearchEnt->v.classname), "player")) { {
if(pSearchEnt->v.takedamage != DAMAGE_NO) { if (FStrEq(STRING(pSearchEnt->v.classname), "player"))
pSearchEnt->v.health -= 50 + RANDOM_FLOAT(0,3 * iDamageMultiplier); {
if(pSearchEnt->v.health < 1) { if (pSearchEnt->v.takedamage != DAMAGE_NO)
pSearchEnt->v.health = 1; {
pSearchEnt->v.health -= 50 + RANDOM_FLOAT(0, 3 * iDamageMultiplier);
if (pSearchEnt->v.health < 1)
{
MDLL_ClientKill(pSearchEnt); MDLL_ClientKill(pSearchEnt);
} }
} }
@ -178,9 +187,14 @@ static cell AMX_NATIVE_CALL RadiusDamage_AMXModX(AMX *amx, cell *params)
pSearchEnt = NULL; pSearchEnt = NULL;
while((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 2 * iRadiusMultiplier)) != NULL) { while ((pSearchEnt = UTIL_FindEntityInSphere(pSearchEnt, vOrigin, 2 * iRadiusMultiplier)) != NULL)
if(FStrEq(STRING(pSearchEnt->v.classname), "player")) { {
if(pSearchEnt->v.takedamage != DAMAGE_NO) MDLL_ClientKill(pSearchEnt); if (FStrEq(STRING(pSearchEnt->v.classname), "player"))
{
if (pSearchEnt->v.takedamage != DAMAGE_NO)
{
MDLL_ClientKill(pSearchEnt);
}
} }
} }