CSSZombieEscape/sm-zombiereloaded-3
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge (fixed napalm)

Browse Source
This commit is contained in:
Andrew 2011-06-24 17:06:16 -07:00
commit f742ea5b45
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/zr/napalm.inc
View File

@ -84,20 +84,8 @@ NapalmOnTakeDamage(client, damagetype)
{
// Put the fire out.
//ExtinguishEntity(client);
ExtinguishEntity2(client);
//ExtinguishEntity(client); <-- Don't use this. Takes off the FL_ONFIRE flag, but flame doesn't get extinguished.
return _:ACTION_CONTINUE;
}
}
}
// Let the damage module continue as usual.
return -1;
}
ExtinguishEntity2(client)
{
// This works.
new fire = GetEntPropEnt(client, Prop_Data, "m_hEffectEntity");
if (IsValidEntity(fire))
@ -115,6 +103,14 @@ ExtinguishEntity2(client)
LogEvent(false, LogType_Normal, LOG_GAME_EVENTS, LogModule_Napalm, "Napalm Douse", "Found unexpected entity in prop \"m_flLifetime\": \"%s\"", classname);
}
}
return _:ACTION_CONTINUE;
}
}
}
// Let the damage module continue as usual.
return -1;
}
/**
@ -159,7 +155,8 @@ NapalmOnClientHurt(client, attacker, const String:weapon[])
if (reset || !(flags & FL_ONFIRE))
{
ExtinguishEntity2(client);
// This stops the fire before re-ignition.
ExtinguishEntity(client);
// Ignite client.
IgniteEntity(client, napalm_time);