Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --combined qcsrc/warpzonelib/server.qc
index 82063b20493b05a87090e12bb8622360b7d5fd02,c3bbba4ac1f329b5a72ffb7a42f525b5bce8229b..476b4ca201ee3f9cbc4300436a87a7ea044bf9a8
--- 1/qcsrc/warpzonelib/server.qc
--- 2/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@@ -42,6 -42,7 +42,7 @@@ float WarpZone_Teleported_Send(entity t
  }
  
  #define WARPZONE_TELEPORT_FIXSOLID(ret) \
+       do \
        { \
                setorigin(player, o1 - player.view_ofs); \
                if(WarpZoneLib_MoveOutOfSolid(player)) \
@@@ -55,15 -56,18 +56,18 @@@
                        setorigin(player, o0 - player.view_ofs); \
                        return (ret); \
                } \
-       }
+       } \
+       while(0)
  #define WARPZONE_TELEPORT_DOTELEPORT() \
+       do \
        { \
                WarpZone_RefSys_Add(player, wz); \
                WarpZone_TeleportPlayer(wz, player, o1 - player.view_ofs, a1, v1); \
                WarpZone_StoreProjectileData(player); \
                player.warpzone_teleport_time = time; \
                player.warpzone_teleport_zone = wz; \
-       }
+       } \
+       while(0)
  
  float WarpZone_Teleport(entity wz, entity player, float f0, float f1)
  {
@@@ -784,7 -788,7 +788,7 @@@ void WarpZone_StartFrame(
                                if(WarpZoneLib_ExactTrigger_Touch())
                                        continue;
                                if(WarpZone_PlaneDist(self, e.origin + e.view_ofs) <= 0)
 -                                      WarpZone_Teleport(self, e); // NOT triggering targets by this!
 +                                      WarpZone_Teleport(self, e, -1, 0); // NOT triggering targets by this!
                        }
                        if(f == CLIENTTYPE_NOTACLIENT)
                        {