fix the boxiness code :P

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 605fd7019a3ce04ccd885f2a2d4ca09842458bf1..1dbe824d6629929a90d053e2d9e8b71abea64160 100644 (file)
--- 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 c8e1f664b4465bb0a44277c4197c8f4c83db252b..2fa8d55e4c101aaeca35e116fbad93b6d4a15852 100644 (file)
--- 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 1a4c368c3e08098d7fd401df78e615b250c749a5..ec2e50d162abdef5c909871c6951282e689589db 100644 (file)
--- 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 f333beaff7a660e4438683e5fbda37cce236b2ca..33b736e562174b71eaee0fab2de381a0eb523ca8 100644 (file)
--- 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 eca17af58458b39e5d974f0b34b4201813873016..daa8e6ddc17b4c6d23536066a67d3033141ff103 100644 (file)
--- 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)