func_door: 'netname' trigger happens when door returns to its original
position, not the other way around.
This commit is contained in:
parent
3726139eda
commit
df2a385bbd
1 changed files with 8 additions and 8 deletions
|
@ -156,14 +156,6 @@ func_door::Arrived(void)
|
||||||
sound(this, CHAN_VOICE, "common/null.wav", 1.0f, ATTN_NORM);
|
sound(this, CHAN_VOICE, "common/null.wav", 1.0f, ATTN_NORM);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targetClose)
|
|
||||||
for (entity f = world; (f = find(f, ::targetname, targetClose));) {
|
|
||||||
NSEntity trigger = (NSEntity)f;
|
|
||||||
if (trigger.Trigger != __NULL__) {
|
|
||||||
trigger.Trigger(this, TRIG_TOGGLE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(spawnflags & SF_MOV_USE)) {
|
if (!(spawnflags & SF_MOV_USE)) {
|
||||||
touch = Touch;
|
touch = Touch;
|
||||||
}
|
}
|
||||||
|
@ -184,6 +176,14 @@ func_door::Returned(void)
|
||||||
velocity = [0,0,0];
|
velocity = [0,0,0];
|
||||||
nextthink = 0.0f;
|
nextthink = 0.0f;
|
||||||
|
|
||||||
|
if (targetClose)
|
||||||
|
for (entity f = world; (f = find(f, ::targetname, targetClose));) {
|
||||||
|
NSEntity trigger = (NSEntity)f;
|
||||||
|
if (trigger.Trigger != __NULL__) {
|
||||||
|
trigger.Trigger(this, TRIG_TOGGLE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (m_strSndStop) {
|
if (m_strSndStop) {
|
||||||
Sound_Play(this, CHAN_VOICE, m_strSndStop);
|
Sound_Play(this, CHAN_VOICE, m_strSndStop);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue