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

Imported fix from dev: 643:233fb9417720 - Fixed the error in napalm module, and made it log the unexpected values for future study.

Browse Source
This commit is contained in:
Richard Helgeby 2010-02-14 16:36:48 +01:00
parent 12f5092e9e
commit 05895df252
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/zr/napalm.inc
View File

@ -77,7 +77,7 @@ NapalmOnTakeDamage(client, damagetype)
// Only take action if it isn't disabled, or the option is valid. // Only take action if it isn't disabled, or the option is valid.
new douse = GetConVarInt(g_hCvarsList[CVAR_NAPALM_DOUSE]); new douse = GetConVarInt(g_hCvarsList[CVAR_NAPALM_DOUSE]);
if (douse > 0 && douse <= 3) if (douse > NAPALM_WLEVEL_DRY && douse <= NAPALM_WLEVEL_FULL)
{ {
// If the client water-level is equal or higher than the given, then we want to extinguish the flame. // If the client water-level is equal or higher than the given, then we want to extinguish the flame.
if (NapalmGetClientWaterLevel(client) >= douse) if (NapalmGetClientWaterLevel(client) >= douse)
@ -87,16 +87,24 @@ NapalmOnTakeDamage(client, damagetype)
//ExtinguishEntity(client); <-- Don't use this. Takes off the FL_ONFIRE flag, but flame doesn't get extinguished. //ExtinguishEntity(client); <-- Don't use this. Takes off the FL_ONFIRE flag, but flame doesn't get extinguished.
// This works. // This works.
new ent = GetEntPropEnt(client, Prop_Data, "m_hEffectEntity"); new fire = GetEntPropEnt(client, Prop_Data, "m_hEffectEntity");
if (IsValidEdict(ent)) if (IsValidEntity(fire))
SetEntPropFloat(ent, Prop_Data, "m_flLifetime", 0.0); {
// Make sure the entity is a flame, so we can extinguish it.
decl String:classname[64];
GetEdictClassname(fire, classname, sizeof(classname));
if (StrEqual(classname, "entityflame", false))
{
SetEntPropFloat(fire, Prop_Data, "m_flLifetime", 0.0);
}
// Log what entity was in that property, for future reference.
else
{
LogEvent(false, LogType_Normal, LOG_GAME_EVENTS, LogModule_Napalm, "Napalm Douse", "Found unexpected entity in prop \"m_flLifetime\": \"%s\"", classname);
}
}
// Stop the last bit of inflicted burn damage. return _:ACTION_CONTINUE;
#if defined USE_SDKHOOKS
return _:Plugin_Handled;
#else
return _:ZRTools_Handled;
#endif
} }
} }
} }