From 8ed2c586c4ebd8669c5e3ca684468101b414844e Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 9 Aug 2008 19:52:21 +0000 Subject: [PATCH] make mins/maxs only triggers work git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4082 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_subs.qc | 15 ++++++++++++++- data/qcsrc/server/t_teleporters.qc | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/g_subs.qc b/data/qcsrc/server/g_subs.qc index a123bc5af..fed70c307 100644 --- a/data/qcsrc/server/g_subs.qc +++ b/data/qcsrc/server/g_subs.qc @@ -379,7 +379,14 @@ void InitTrigger() if (self.angles != '0 0 0') SetMovedir (); self.solid = SOLID_TRIGGER; - setmodel (self, self.model); // set size and link into world, no precision needed + if(self.model != "") + setmodel (self, self.model); // set size and link into world, no precision needed + else + { + // force relinking + setorigin(self, self.origin); + setsize (self, self.mins, self.maxs); + } self.movetype = MOVETYPE_NONE; self.modelindex = 0; self.model = ""; @@ -395,6 +402,12 @@ void InitSolidBSPTrigger() self.solid = SOLID_BSP; if(self.model != "") setmodel (self, self.model); // set size and link into world, no precision needed + else + { + // force relinking + setorigin(self, self.origin); + setsize (self, self.mins, self.maxs); + } self.movetype = MOVETYPE_PUSH; // self.modelindex = 0; self.model = ""; diff --git a/data/qcsrc/server/t_teleporters.qc b/data/qcsrc/server/t_teleporters.qc index 0bf71e997..54c428193 100644 --- a/data/qcsrc/server/t_teleporters.qc +++ b/data/qcsrc/server/t_teleporters.qc @@ -185,6 +185,12 @@ void spawnfunc_trigger_teleport (void) if(self.model != "") setmodel (self, self.model); // no precision needed + else + { + // force relinking + setorigin(self, self.origin); + setsize (self, self.mins, self.maxs); + } self.model = ""; self.modelindex = 0; -- 2.39.2