Merge branch 'master' into terencehill/string_prefixes_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / sv_cmd.qc

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 7ffd1b924f3799b7a8e15a8adc531e686ae13f27..7166ab7cfd1156b9377724ac6f2586e591f24872 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1,9 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
-    #include "../sys-post.qh"
+       #include "../../dpdefs/progsdefs.qh"
+    #include "../../dpdefs/dpextensions.qh"
     #include "../../warpzonelib/mathlib.qh"
     #include "../../common/constants.qh"
     #include "../../common/teams.qh"
@@ -109,7 +108,7 @@ void GameCommand_adminmsg(float request, float argc)
 
                        if((targets) && (admin_message))
                        {
-                               for(0;targets;)
+                               for (;targets;)
                                {
                                        t = car(targets); targets = cdr(targets);
 
@@ -505,7 +504,7 @@ void GameCommand_cointoss(float request, float argc)
                        string result1 = (argv(2) ? strcat("^7", argv(1)) : "^1HEADS");
                        string result2 = (argv(2) ? strcat("^7", argv(2)) : "^4TAILS");
                        string choice = ((random() > 0.5) ? result1 : result2);
-                       
+
                        Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_COINTOSS, choice);
                        return;
                }
@@ -869,7 +868,7 @@ void GameCommand_gettaginfo(float request, float argc)
                                        print(" up = ", ftos(gettaginfo_up.x), " ", ftos(gettaginfo_up.y), " ", ftos(gettaginfo_up.z), "\n");
                                        if(argc >= 6)
                                        {
-                                               v_y = -v.y;
+                                               v.y = -v.y;
                                                localcmd(strcat(argv(4), vtos(v), argv(5), "\n"));
                                        }
                                }
@@ -1048,7 +1047,7 @@ void GameCommand_moveplayer(float request, float argc)
                        // lets see if the target(s) even actually exist.
                        if((targets) && (destination))
                        {
-                               for(0;targets;)
+                               for (;targets;)
                                {
                                        t = car(targets); targets = cdr(targets);
 
@@ -1380,7 +1379,8 @@ void GameCommand_shuffleteams(float request)
                        if(teamplay)
                        {
                                entity tmp_player;
-                               float i, x, z, t_teams, t_players, team_color;
+                               int i;
+                               float x, z, t_teams, t_players, team_color;
 
                                // count the total amount of players and total amount of teams
                                t_players = 0;
@@ -1400,7 +1400,7 @@ void GameCommand_shuffleteams(float request)
                                // build a list of the players in a random order
                                FOR_EACH_PLAYER(tmp_player)
                                {
-                                       for(0;;)
+                                       for (;;)
                                        {
                                                i = bound(1, floor(random() * maxclients) + 1, maxclients);
 
@@ -1542,18 +1542,18 @@ void GameCommand_trace(float request, float argc)
                                        float hitcount = 0;
                                        print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
                                        float worst_endpos_bug = 0;
-                                       for(0;;)
+                                       for (;;)
                                        {
                                                org = world.mins;
                                                delta = world.maxs - world.mins;
 
-                                               start_x = org.x + random() * delta.x;
-                                               start_y = org.y + random() * delta.y;
-                                               start_z = org.z + random() * delta.z;
+                                               start.x = org.x + random() * delta.x;
+                                               start.y = org.y + random() * delta.y;
+                                               start.z = org.z + random() * delta.z;
 
-                                               end_x = org.x + random() * delta.x;
-                                               end_y = org.y + random() * delta.y;
-                                               end_z = org.z + random() * delta.z;
+                                               end.x = org.x + random() * delta.x;
+                                               end.y = org.y + random() * delta.y;
+                                               end.z = org.z + random() * delta.z;
 
                                                start = stov(vtos(start));
                                                end = stov(vtos(end));
@@ -1571,7 +1571,7 @@ void GameCommand_trace(float request, float argc)
                                                                // how much do we need to back off?
                                                                safe = 1;
                                                                unsafe = 0;
-                                                               for(0;;)
+                                                               for (;;)
                                                                {
                                                                        pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5);
                                                                        tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world);
@@ -1605,7 +1605,7 @@ void GameCommand_trace(float request, float argc)
                                                                q0 = p;
                                                                dq = 0;
                                                                dqf = 1;
-                                                               for(0;;)
+                                                               for (;;)
                                                                {
                                                                        q = p + normalize(end - p) * (dq + dqf);
                                                                        if(q == q0)