Fix a weird bug in a recent commit which was breaking item velocities

[voretournament/voretournament.git] / data / qcsrc / server / arena.qc

diff --git a/data/qcsrc/server/arena.qc b/data/qcsrc/server/arena.qc
index 8220ea5c5264b08ce5ed932498f99e0a9e66c23b..0e30f0d0c3ecc2fd5d3c80bbcd60a7d628991105 100644 (file)
--- a/data/qcsrc/server/arena.qc
+++ b/data/qcsrc/server/arena.qc
@@ -226,15 +226,9 @@ void Arena_Warmup()
                        centerprint(self, msg);\r
                }\r
 \r
-               if (g_arena) {\r
-                       if(self.spawned && self.classname == "player"){}\r
-                               //self.movetype = MOVETYPE_NONE;\r
-\r
-                       self.velocity = '0 0 0';\r
-                       self.avelocity = '0 0 0';\r
-                       self.movement = '0 0 0';\r
-                       //self.fixangle = TRUE;\r
-               }\r
+               if (g_arena)\r
+               if (self.spawned && self.classname == "player")\r
+                       self.movetype = MOVETYPE_NONE;\r
        }\r
 \r
        else if(f > -1 && f != roundStartTime_prev)\r
@@ -242,7 +236,9 @@ void Arena_Warmup()
                roundStartTime_prev = f;\r
                Announce("begin");\r
                centerprint(self, "^1Begin!\n");\r
-               Vore_Disconnect(); // undo vores that happened during warmup, which also prevents some issues\r
+\r
+               FOR_EACH_PLAYER(self)\r
+                       self.movetype = MOVETYPE_WALK;\r
 \r
                if(g_ca) {\r
                        player_cnt = 0;\r