Backed out changeset: 539b63f56ac5
This commit is contained in:
parent
afb4b48e91
commit
8735d191e7
|
@ -84,20 +84,8 @@ NapalmOnTakeDamage(client, damagetype)
|
||||||
{
|
{
|
||||||
// Put the fire out.
|
// Put the fire out.
|
||||||
|
|
||||||
//ExtinguishEntity(client);
|
//ExtinguishEntity(client); <-- Don't use this. Takes off the FL_ONFIRE flag, but flame doesn't get extinguished.
|
||||||
ExtinguishEntity2(client);
|
|
||||||
|
|
||||||
return _:ACTION_CONTINUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Let the damage module continue as usual.
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
ExtinguishEntity2(client)
|
|
||||||
{
|
|
||||||
// This works.
|
// This works.
|
||||||
new fire = GetEntPropEnt(client, Prop_Data, "m_hEffectEntity");
|
new fire = GetEntPropEnt(client, Prop_Data, "m_hEffectEntity");
|
||||||
if (IsValidEntity(fire))
|
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);
|
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))
|
if (reset || !(flags & FL_ONFIRE))
|
||||||
{
|
{
|
||||||
ExtinguishEntity2(client);
|
// This stops the fire before re-ignition.
|
||||||
|
ExtinguishEntity(client);
|
||||||
|
|
||||||
// Ignite client.
|
// Ignite client.
|
||||||
IgniteEntity(client, napalm_time);
|
IgniteEntity(client, napalm_time);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user