diff --git a/build.cfg b/build.cfg index 280d4cf3..7727c08e 100644 --- a/build.cfg +++ b/build.cfg @@ -32,7 +32,7 @@ BUILD_IQMTOOL=1 BUILD_IMGTOOL=1 # Specify which engine revision to build, these are considered 'stable'; 0 = latest -BUILD_ENGINEREVISION=6282 +BUILD_ENGINEREVISION=6283 # Whether or not to run 'git pull' or 'svn up' before building a component BUILD_UPDATE=1 diff --git a/src/gs-entbase/server/trigger_counter.qc b/src/gs-entbase/server/trigger_counter.qc index 56d59288..4497d412 100644 --- a/src/gs-entbase/server/trigger_counter.qc +++ b/src/gs-entbase/server/trigger_counter.qc @@ -108,10 +108,9 @@ trigger_counter::Trigger(entity act, int state) void trigger_counter::Respawn(void) { + InitBrushTrigger(); m_iValue = 0; m_iCounted = 0; - SetSolid(SOLID_TRIGGER); - InitBrushTrigger(); } void diff --git a/src/gs-entbase/server/trigger_hurt.qc b/src/gs-entbase/server/trigger_hurt.qc index eeb1c2b5..70c58251 100644 --- a/src/gs-entbase/server/trigger_hurt.qc +++ b/src/gs-entbase/server/trigger_hurt.qc @@ -219,6 +219,8 @@ trigger_hurt::Touch(entity eToucher) void trigger_hurt::Respawn(void) { + InitBrushTrigger(); + if (HasSpawnFlags(SF_HURT_OFF)) { Trigger(this, TRIG_OFF); } else { diff --git a/src/gs-entbase/server/trigger_once.qc b/src/gs-entbase/server/trigger_once.qc index 4bdc2ce5..0d30e153 100644 --- a/src/gs-entbase/server/trigger_once.qc +++ b/src/gs-entbase/server/trigger_once.qc @@ -105,9 +105,8 @@ trigger_once::Touch(entity eToucher) void trigger_once::Respawn(void) { - m_iValue = 0; - SetSolid(SOLID_TRIGGER); InitBrushTrigger(); + m_iValue = 0; } void