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

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 82063b20493b05a87090e12bb8622360b7d5fd02..476b4ca201ee3f9cbc4300436a87a7ea044bf9a8 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -42,6 +42,7 @@ float WarpZone_Teleported_Send(entity to, float sf)
 }
 
 #define WARPZONE_TELEPORT_FIXSOLID(ret) \
+       do \
        { \
                setorigin(player, o1 - player.view_ofs); \
                if(WarpZoneLib_MoveOutOfSolid(player)) \
@@ -55,15 +56,18 @@ float WarpZone_Teleported_Send(entity to, float sf)
                        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)
 {