mirror of
https://github.com/nzp-team/quakec.git
synced 2025-02-16 17:10:55 +00:00
SERVER: Fix trigger_interact not playing .noise
This commit is contained in:
parent
bd5b6aaf85
commit
e2895760dc
1 changed files with 3 additions and 8 deletions
|
@ -50,9 +50,6 @@ void() multi_trigger =
|
|||
return; // already been triggered
|
||||
}
|
||||
|
||||
if (self.noise)
|
||||
sound (self, CHAN_VOICE, self.noise, 1, ATTN_NORM);
|
||||
|
||||
// don't trigger again until reset
|
||||
self.takedamage = DAMAGE_NO;
|
||||
|
||||
|
@ -67,11 +64,7 @@ void() multi_trigger =
|
|||
}
|
||||
else
|
||||
{
|
||||
// we can't just remove(self) here, because this is a touch function
|
||||
// called while C code is looping through area links...
|
||||
self.touch = SUB_Null;
|
||||
self.nextthink = time + 0.1;
|
||||
self.think = SUB_Remove;
|
||||
Ent_FakeRemove(self);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -272,6 +265,8 @@ void() trigger_interact_touch =
|
|||
return;
|
||||
|
||||
if (other.button7) {
|
||||
if (self.noise)
|
||||
sound (other, CHAN_ITEM, self.noise, 1, ATTN_NORM);
|
||||
multi_trigger();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue