From 3cda024a3337822332a9e8d5ee0edb0e58226b9a Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 28 Jun 2023 14:18:51 -0700 Subject: [PATCH] NSTrigger: change team touch filter to new field team_no --- src/shared/NSTrigger.h | 2 ++ src/shared/NSTrigger.qc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/shared/NSTrigger.h b/src/shared/NSTrigger.h index c336edd2..755d6a2b 100644 --- a/src/shared/NSTrigger.h +++ b/src/shared/NSTrigger.h @@ -132,6 +132,8 @@ private: int m_iUseType; int m_iValue; + float team_no; + /* legacy trigger architecture */ float m_flDelay; #endif diff --git a/src/shared/NSTrigger.qc b/src/shared/NSTrigger.qc index 0c1de316..09d4cee5 100644 --- a/src/shared/NSTrigger.qc +++ b/src/shared/NSTrigger.qc @@ -264,7 +264,7 @@ NSTrigger::SpawnKey(string strKey, string strValue) m_strMaster = strValue; break; case "team_no": - team = stof(strValue); + team_no = stof(strValue); break; case "delay": m_flDelay = stof(strValue); @@ -314,8 +314,8 @@ NSTrigger::_TouchHandler(void) { #ifdef SERVER if (g_grMode.IsTeamplay()) - if (team > 0i) - if (other.team != team) { + if (team_no > 0i) + if (other.team != team_no) { return; } #endif