Remove the CSQC model hook macros (we use a parameter in them now that may cause...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / server.qc

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index b97d58ca0cbe337925bfe7655d8a87c60f862ace..4f15d62123d366ad2c6d00bb5d4598798e817265 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -4,12 +4,12 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../common/constants.qh"
-       #include "../../common/triggers/subs.qh"
-       #include "../../common/util.qh"
-       #include "../../server/command/common.qh"
-       #include "../../server/constants.qh"
-       #include "../../server/defs.qh"
+       #include <common/constants.qh>
+       #include <common/triggers/subs.qh>
+       #include <common/util.qh>
+       #include <server/command/common.qh>
+       #include <server/constants.qh>
+       #include <server/defs.qh>
 #endif
 
 #ifdef WARPZONELIB_KEEPDEBUG
@@ -28,18 +28,21 @@
 .float warpzone_teleport_finishtime;
 .entity warpzone_teleport_zone;
 
-void WarpZone_StoreProjectileData(entity e)
-{
 #ifdef SVQC
-       e.warpzone_oldorigin = e.origin;
-       e.warpzone_oldvelocity = e.velocity;
-       e.warpzone_oldangles = e.angles;
+       #define WarpZone_StoreProjectileData(e_) MACRO_BEGIN { \
+               entity e = e_; \
+               e.warpzone_oldorigin = e.origin; \
+               e.warpzone_oldvelocity = e.velocity; \
+               e.warpzone_oldangles = e.angles; \
+               } MACRO_END
 #elif defined(CSQC)
-       e.warpzone_oldorigin = e.move_origin;
-       e.warpzone_oldvelocity = e.move_velocity;
-       e.warpzone_oldangles = e.move_angles;
+       #define WarpZone_StoreProjectileData(e_) MACRO_BEGIN { \
+               entity e = e_; \
+               e.warpzone_oldorigin = e.move_origin; \
+               e.warpzone_oldvelocity = e.move_velocity; \
+               e.warpzone_oldangles = e.move_angles; \
+               } MACRO_END
 #endif
-}
 
 void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity)
 {
@@ -634,7 +637,7 @@ void WarpZone_InitStep_UpdateTransform()
        {
                norm = norm * (1 / area);
                point = point * (1 / (3 * area));
-               if(vlen(norm) < 0.99)
+               if(vdist(norm, <, 0.99))
                {
                        LOG_INFO("trigger_warpzone near ", vtos(self.aiment.origin), " is nonplanar. BEWARE.\n");
                        area = 0; // no autofixing in this case
@@ -660,7 +663,7 @@ void WarpZone_InitStep_UpdateTransform()
                        ang.x = -ang.x;
                        if(norm * v_forward < 0.99)
                                LOG_INFO("trigger_warpzone near ", vtos(self.aiment.origin), " has been turned to match plane orientation (", vtos(self.aiment.angles), " -> ", vtos(ang), "\n");
-                       if(vlen(org - self.aiment.origin) > 0.5)
+                       if(vdist(org - self.aiment.origin, >, 0.5))
                                LOG_INFO("trigger_warpzone near ", vtos(self.aiment.origin), " has been moved to match the plane (", vtos(self.aiment.origin), " -> ", vtos(org), ").\n");
                }
        }
@@ -864,40 +867,33 @@ void WarpZone_StartFrame()
        }
 
        entity oldother = other;
-       for (entity e = world; (e = nextent(e)); )
+
+       FOREACH_ENTITY(true,
        {
-               if (warpzone_warpzones_exist) WarpZone_StoreProjectileData(e);
-               if (IS_REAL_CLIENT(e))
+               if(warpzone_warpzones_exist)
+                       WarpZone_StoreProjectileData(it);
+
+               if((IS_OBSERVER(it) || it.solid == SOLID_NOT))
+               if(IS_CLIENT(it)) // we don't care about it being a bot
                {
-                       if (e.solid == SOLID_NOT) // not spectating?
-                       if (e.movetype == MOVETYPE_NOCLIP || e.movetype == MOVETYPE_FLY || e.movetype == MOVETYPE_FLY_WORLDONLY) // not spectating? (this is to catch observers)
-                       {
-                               other = e; // player
-
-                               // warpzones
-                               if (warpzone_warpzones_exist) {
-                                       setself(WarpZone_Find(e.origin + e.mins, e.origin + e.maxs));
-                                       if (self)
-                                       if (!WarpZoneLib_ExactTrigger_Touch())
-                                       if (WarpZone_PlaneDist(self, e.origin + e.view_ofs) <= 0)
-                                               WarpZone_Teleport(self, e, -1, 0); // NOT triggering targets by this!
-                               }
-
-                               // teleporters
-                               setself(Teleport_Find(e.origin + e.mins, e.origin + e.maxs));
+                       other = it; // player
+
+                       // warpzones
+                       if (warpzone_warpzones_exist) {
+                               setself(WarpZone_Find(it.origin + it.mins, it.origin + it.maxs));
                                if (self)
                                if (!WarpZoneLib_ExactTrigger_Touch())
-                                       Simple_TeleportPlayer(self, other); // NOT triggering targets by this!
+                               if (WarpZone_PlaneDist(self, it.origin + it.view_ofs) <= 0)
+                                       WarpZone_Teleport(self, it, -1, 0); // NOT triggering targets by this!
                        }
+
+                       // teleporters
+                       setself(Teleport_Find(it.origin + it.mins, it.origin + it.maxs));
+                       if (self)
+                       if (!WarpZoneLib_ExactTrigger_Touch())
+                               Simple_TeleportPlayer(self, other); // NOT triggering targets by this!
                }
-               else if (IS_NOT_A_CLIENT(e))
-               {
-                       if (warpzone_warpzones_exist)
-                               while ((e = nextent(e)))
-                                       WarpZone_StoreProjectileData(e);
-                       break;
-               }
-       }
+       });
        setself(this);
        other = oldother;
 }