From 78ccd2f4ecc706e16db9c6c828b552769fc51417 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sat, 5 Jan 2019 16:34:28 +0100 Subject: [PATCH] trigger_multiple: Added wait = -1 behaviour (fixes de_survivor's car light flickering) --- Source/gs-entbase/server/trigger_multiple.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/gs-entbase/server/trigger_multiple.cpp b/Source/gs-entbase/server/trigger_multiple.cpp index a5cdc91b..6d768a0b 100644 --- a/Source/gs-entbase/server/trigger_multiple.cpp +++ b/Source/gs-entbase/server/trigger_multiple.cpp @@ -30,8 +30,12 @@ void trigger_multiple :: touch ( void ) } else { CBaseTrigger::UseTargets(); } - think = Respawn; - nextthink = time + m_flWait; + + /* This is effectively a trigger_once...*/ + if (m_flWait != -1) { + think = Respawn; + nextthink = time + m_flWait; + } solid = SOLID_NOT; #ifdef GS_DEVELOPER @@ -61,6 +65,7 @@ void trigger_multiple :: trigger_multiple ( void ) break; } } + trigger_multiple::Respawn(); CBaseEntity::CBaseEntity(); CBaseTrigger::InitBrushTrigger();