From b67930682aca9445674031b4ddadc26f5ed8f51a Mon Sep 17 00:00:00 2001 From: tschumann Date: Sat, 19 Apr 2025 16:50:36 +1000 Subject: [PATCH 1/2] Support Pushable flag on trigger_teleport. --- src/game/server/triggers.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp index 5d472428..6b4f1594 100644 --- a/src/game/server/triggers.cpp +++ b/src/game/server/triggers.cpp @@ -2295,6 +2295,15 @@ void CBaseTrigger ::TeleportTouch(CBaseEntity *pOther) if (!UTIL_IsMasterTriggered(m_sMaster, pOther)) return; + if (!(pev->spawnflags & SF_TRIGGER_PUSHABLES)) + { + // only pushables allowed! + if (!FClassnameIs(pevToucher, "func_pushable")) + { + return; + } + } + if (!(pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS)) { // no monsters allowed! if (FBitSet(pevToucher->flags, FL_MONSTER)) From e5d8d70825b29226b5a5e7391e5099cd60cc97fc Mon Sep 17 00:00:00 2001 From: tschumann Date: Sun, 4 May 2025 08:09:12 +1000 Subject: [PATCH 2/2] Fix SF_TRIGGER_PUSHABLES condition. --- src/game/server/triggers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/triggers.cpp b/src/game/server/triggers.cpp index 6b4f1594..503559c6 100644 --- a/src/game/server/triggers.cpp +++ b/src/game/server/triggers.cpp @@ -2295,7 +2295,7 @@ void CBaseTrigger ::TeleportTouch(CBaseEntity *pOther) if (!UTIL_IsMasterTriggered(m_sMaster, pOther)) return; - if (!(pev->spawnflags & SF_TRIGGER_PUSHABLES)) + if (pev->spawnflags & SF_TRIGGER_PUSHABLES) { // only pushables allowed! if (!FClassnameIs(pevToucher, "func_pushable"))