From da0b48d6b1b5889fdba500a7f4f2269163bd1230 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 4 Aug 2010 15:34:46 +0200 Subject: [PATCH] fix the boxiness code :P --- qcsrc/warpzonelib/client.qc | 2 +- qcsrc/warpzonelib/common.qc | 2 +- qcsrc/warpzonelib/common.qh | 1 + qcsrc/warpzonelib/server.qc | 2 +- qcsrc/warpzonelib/util_server.qc | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc index 605fd7019..1dbe824d6 100644 --- a/qcsrc/warpzonelib/client.qc +++ b/qcsrc/warpzonelib/client.qc @@ -7,7 +7,7 @@ void WarpZone_Read(float isnew) } self.classname = "trigger_warpzone"; - self.WarpZone_isboxy = ReadByte(); + self.warpzone_isboxy = ReadByte(); self.origin_x = ReadCoord(); self.origin_y = ReadCoord(); self.origin_z = ReadCoord(); diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc index c8e1f664b..2fa8d55e4 100644 --- a/qcsrc/warpzonelib/common.qc +++ b/qcsrc/warpzonelib/common.qc @@ -113,7 +113,7 @@ float WarpZoneLib_BoxTouchesBrush(vector mi, vector ma, entity e, entity ig) { float f, s; - if(!e.modelindex || e.WarpZone_isboxy) + if(!e.modelindex || e.warpzone_isboxy) return 1; s = e.solid; diff --git a/qcsrc/warpzonelib/common.qh b/qcsrc/warpzonelib/common.qh index 1a4c368c3..ec2e50d16 100644 --- a/qcsrc/warpzonelib/common.qh +++ b/qcsrc/warpzonelib/common.qh @@ -3,6 +3,7 @@ const void func_null(void); // never assign to this one please +.float warpzone_isboxy; .vector warpzone_shift; .vector warpzone_origin; .vector warpzone_angles; diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc index f333beaff..33b736e56 100644 --- a/qcsrc/warpzonelib/server.qc +++ b/qcsrc/warpzonelib/server.qc @@ -131,7 +131,7 @@ float WarpZone_Send(entity to, float sendflags) WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE); // we must send this flag for clientside to match properly too - WriteByte(MSG_ENTITY, self.WarpZone_isboxy); + WriteByte(MSG_ENTITY, self.warpzone_isboxy); // we need THESE to render the warpzone (and cull properly)... WriteCoord(MSG_ENTITY, self.origin_x); diff --git a/qcsrc/warpzonelib/util_server.qc b/qcsrc/warpzonelib/util_server.qc index eca17af58..daa8e6ddc 100644 --- a/qcsrc/warpzonelib/util_server.qc +++ b/qcsrc/warpzonelib/util_server.qc @@ -67,7 +67,7 @@ void WarpZoneLib_ExactTrigger_Init() makevectors (self.angles); self.movedir = v_forward; } - self.WarpZone_isboxy = 1; + self.warpzone_isboxy = 1; if(self.model != "") { mi = self.mins; @@ -81,7 +81,7 @@ void WarpZoneLib_ExactTrigger_Init() self.maxs = ma; } else - self.WarpZone_isboxy = 0; // enable exacttrigger matching + self.warpzone_isboxy = 0; // enable exacttrigger matching } setorigin(self, self.origin); if(self.scale) -- 2.39.2