Fix prediction of SOLID_NOT on triggers (also fixes projectiles bouncing in corners...

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 324f67b31088a0a05444979906118a6ab9c5c59b..0d6b98eaa810db404faed63b61b16477f01253f1 100644 (file)
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -338,10 +338,14 @@ void _Movetype_Impact(entity this, entity oth)  // SV_Impact
 
 void _Movetype_LinkEdict_TouchAreaGrid(entity this)  // SV_LinkEdict_TouchAreaGrid
 {
+       if(this.solid == SOLID_NOT)
+               return;
+
        entity oldother = other;
 
        for (entity e = findradius(0.5 * (this.absmin + this.absmax), 0.5 * vlen(this.absmax - this.absmin)); e; e = e.chain)
        {
+               if(e.solid == SOLID_TRIGGER && e != this)
                if(e.move_nomonsters != MOVE_NOMONSTERS && e.move_nomonsters != MOVE_WORLDONLY)
                if(e.move_touch && boxesoverlap(e.absmin, e.absmax, this.absmin, this.absmax))
                {

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 22aaba8627e6e3ae072239ab1a9c2b3997eb7a5e..21f69a80d5dee81c24925d6cad5076ee9cb3db2d 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -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)
 {
@@ -864,40 +867,32 @@ 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) && IS_REAL_CLIENT(it))
                {
-                       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;
 }