fn/cstrike
fn/cstrike
3
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

item_c4bomb: Trigger the func_bomb_target entities properly.

Browse source
This commit is contained in:
Marco Cawthorne 2023-09-29 15:55:16 -07:00
parent 0a73ca690f
commit e23e3eb02b
Signed by: eukara
GPG key ID: CE2032F0A2882A22
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/shared/item_c4bomb.qc
View file

@ -124,7 +124,10 @@ item_c4::Logic(void)
}
/* if our time has passed, explode */
if (m_flExplodeTime < time) {\
if (m_flExplodeTime < time) {
float bestDist = 9999.0f;
NSEntity bestTarget = __NULL__;
/* In Bomb Defusal, all Terrorists receive $3500
* if they won by detonating the bomb. */
rules.RoundOver(TEAM_T, 3500, FALSE);
@ -132,12 +135,19 @@ item_c4::Logic(void)
Sound_Play(this, CHAN_VOICE, "weapon_c4bomb.explode");
for (entity e = world; (e = find(e, ::classname, "func_bomb_target"));) {
NSEntity trigger = (NSEntity)e;
if (trigger.Trigger != __NULL__) {
trigger.Trigger(this, TRIG_TOGGLE);
float dist = vlen(origin - e.origin);
if (dist < bestDist) {
bestDist = dist;
bestTarget = e;
}
}
/* Found it. */
if (bestTarget) {
bestTarget.UseTargets(this, TRIG_TOGGLE, 0.0f);
}
Destroy();
return;
}