]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/command/sv_cmd.qc
Merged master
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / sv_cmd.qc
index 55879fd35b1f51eb55a28838fd522aeee6376b59..dba41cc9cee11d5897f58d569ff60695000b3878 100644 (file)
@@ -34,7 +34,6 @@ void PutObserverInServer(entity this);
 
 // =====================================================
 //  Server side game commands code, reworked by Samual
-//  Last updated: December 29th, 2011
 // =====================================================
 
 //  used by GameCommand_make_mapinfo()
@@ -135,12 +134,12 @@ void GameCommand_adminmsg(float request, float argc)
                                        }
                                        else
                                        {
-                                               centerprint(client, strcat("^3", admin_name(), ":\n^7", admin_message));
-                                               sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", admin_message, "\n"));
+                                               centerprint(client, strcat("^3", GetCallerName(NULL), ":\n^7", admin_message));
+                                               sprint(client, strcat("\{1}\{13}^3", GetCallerName(NULL), "^7: ", admin_message, "\n"));
                                        }
 
-                                       successful = strcat(successful, (successful ? ", " : ""), client.netname);
-                                       LOG_TRACE("Message sent to ", client.netname);
+                                       successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
+                                       LOG_TRACE("Message sent to ", playername(client, false));
                                        continue;
                                }
 
@@ -252,20 +251,15 @@ void GameCommand_bbox(float request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       LOG_INFO("Original size: ", ftos(world.absmin.x), " ", ftos(world.absmin.y), " ", ftos(world.absmin.z));
-                       LOG_INFO(" ", ftos(world.absmax.x), " ", ftos(world.absmax.y), " ", ftos(world.absmax.z), "\n");
-                       LOG_INFO("Currently set size: ", ftos(world.mins.x), " ", ftos(world.mins.y), " ", ftos(world.mins.z));
-                       LOG_INFO(" ", ftos(world.maxs.x), " ", ftos(world.maxs.y), " ", ftos(world.maxs.z), "\n");
-                       LOG_INFO("Solid bounding box size:");
-
+                       vector size_min = '0 0 0';
+                       vector size_max = '0 0 0';
                        tracebox('1 0 0' * world.absmin.x,
                                '0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z,
                                '0 1 0' * world.absmax.y + '0 0 1' * world.absmax.z,
                                '1 0 0' * world.absmax.x,
                                MOVE_WORLDONLY,
                                NULL);
-                       if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.x));
-                       else LOG_INFO(" ", ftos(trace_endpos.x));
+                       size_min.x = (trace_startsolid) ? world.absmin.x : trace_endpos.x;
 
                        tracebox('0 1 0' * world.absmin.y,
                                '1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z,
@@ -273,8 +267,7 @@ void GameCommand_bbox(float request)
                                '0 1 0' * world.absmax.y,
                                MOVE_WORLDONLY,
                                NULL);
-                       if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.y));
-                       else LOG_INFO(" ", ftos(trace_endpos.y));
+                       size_min.y = (trace_startsolid) ? world.absmin.y : trace_endpos.y;
 
                        tracebox('0 0 1' * world.absmin.z,
                                '1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y,
@@ -282,8 +275,7 @@ void GameCommand_bbox(float request)
                                '0 0 1' * world.absmax.z,
                                MOVE_WORLDONLY,
                                NULL);
-                       if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.z));
-                       else LOG_INFO(" ", ftos(trace_endpos.z));
+                       size_min.z = (trace_startsolid) ? world.absmin.z : trace_endpos.z;
 
                        tracebox('1 0 0' * world.absmax.x,
                                '0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z,
@@ -291,8 +283,7 @@ void GameCommand_bbox(float request)
                                '1 0 0' * world.absmin.x,
                                MOVE_WORLDONLY,
                                NULL);
-                       if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.x));
-                       else LOG_INFO(" ", ftos(trace_endpos.x));
+                       size_max.x = (trace_startsolid) ? world.absmax.x : trace_endpos.x;
 
                        tracebox('0 1 0' * world.absmax.y,
                                '1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z,
@@ -300,8 +291,7 @@ void GameCommand_bbox(float request)
                                '0 1 0' * world.absmin.y,
                                MOVE_WORLDONLY,
                                NULL);
-                       if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.y));
-                       else LOG_INFO(" ", ftos(trace_endpos.y));
+                       size_max.y = (trace_startsolid) ? world.absmax.y : trace_endpos.y;
 
                        tracebox('0 0 1' * world.absmax.z,
                                '1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y,
@@ -309,10 +299,11 @@ void GameCommand_bbox(float request)
                                '0 0 1' * world.absmin.z,
                                MOVE_WORLDONLY,
                                NULL);
-                       if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.z));
-                       else LOG_INFO(" ", ftos(trace_endpos.z));
+                       size_max.z = (trace_startsolid) ? world.absmax.z : trace_endpos.z;
 
-                       LOG_INFO("\n");
+                       LOG_INFOF("Original size: %v %v\n", world.absmin, world.absmax);
+                       LOG_INFOF("Currently set size: %v %v\n", world.mins, world.maxs);
+                       LOG_INFOF("Solid bounding box size: %v %v\n", size_min, size_max);
                        return;
                }
 
@@ -543,7 +534,7 @@ void GameCommand_defer_clear(float request, float argc)
                                if (accepted > 0)
                                {
                                        stuffcmd(client, "defer clear\n");
-                                       LOG_INFO("defer clear stuffed to ", client.netname, "\n");
+                                       LOG_INFO("defer clear stuffed to ", playername(client, false), "\n");
                                }
                                else { LOG_INFO("defer_clear: ", GetClientErrorString(accepted, argv(1)), ".\n"); }
 
@@ -1048,11 +1039,11 @@ void GameCommand_moveplayer(float request, float argc)
                                                        if (client.caplayer) client.caplayer = 0;
                                                        PutObserverInServer(client);
 
-                                                       successful = strcat(successful, (successful ? ", " : ""), client.netname);
+                                                       successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
                                                }
                                                else
                                                {
-                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already spectating.\n");
+                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating.\n");
                                                }
                                                continue;
                                        }
@@ -1072,7 +1063,7 @@ void GameCommand_moveplayer(float request, float argc)
                                                                if (team_id == client.team)  // already on the destination team
                                                                {
                                                                        // keep the forcing undone
-                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.\n"));
+                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.\n"));
                                                                        continue;
                                                                }
                                                                else if (team_id == 0)  // auto team
@@ -1100,9 +1091,15 @@ void GameCommand_moveplayer(float request, float argc)
 
                                                                // If so, lets continue and finally move the player
                                                                client.team_forced = 0;
-                                                               MoveToTeam(client, team_id, 6);
-                                                               successful = strcat(successful, (successful ? ", " : ""), client.netname);
-                                                               LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n");
+                                                               if (MoveToTeam(client, team_id, 6))
+                                                               {
+                                                                       successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
+                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n");
+                                                               }
+                                                               else
+                                                               {
+                                                                       LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ")");
+                                                               }
                                                                continue;
                                                        }
                                                        else
@@ -1153,7 +1150,7 @@ void GameCommand_nospectators(float request)
                        FOREACH_CLIENT(IS_REAL_CLIENT(it) && (IS_SPEC(it) || IS_OBSERVER(it)) && !it.caplayer, LAMBDA(
                                if(!it.caplayer)
                                {
-                                       it.spectatortime = time;
+                                       CS(it).spectatortime = time;
                                        Send_Notification(NOTIF_ONE_ONLY, it, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);
                                }
                        ));
@@ -1348,90 +1345,37 @@ void GameCommand_shuffleteams(float request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       if (teamplay)
+                       if (!teamplay)
                        {
-                               float t_teams, t_players, team_color;
-
-                               // count the total amount of players and total amount of teams
-                               t_players = 0;
-                               t_teams = 0;
-                               FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, LAMBDA(
-                                       CheckAllowedTeams(it);
-
-                                       if (c1 >= 0) t_teams = max(1, t_teams);
-                                       if (c2 >= 0) t_teams = max(2, t_teams);
-                                       if (c3 >= 0) t_teams = max(3, t_teams);
-                                       if (c4 >= 0) t_teams = max(4, t_teams);
-
-                                       ++t_players;
-                               ));
-
-                               // build a list of the players in a random order
-                               FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, LAMBDA(
-                                       for ( ; ; )
-                                       {
-                                               int idx = bound(1, floor(random() * maxclients) + 1, maxclients);
-
-                                               if (shuffleteams_players[idx])
-                                               {
-                                                       continue;  // a player is already assigned to this slot
-                                               }
-                                               else
-                                               {
-                                                       shuffleteams_players[idx] = etof(it);
-                                                       break;
-                                               }
-                                       }
-                               ));
-
-                               // finally, from the list made earlier, re-join the players in different order.
-                               for (int i = 1; i <= t_teams; ++i)
-                               {
-                                       // find out how many players to assign to this team
-                                       int pnum = (t_players / t_teams);
-                                       pnum = ((i == 1) ? ceil(pnum) : floor(pnum));
-
-                                       team_color = Team_NumberToTeam(i);
-
-                                       // sort through the random list of players made earlier
-                                       for (int z = 1; z <= maxclients; ++z)
-                                       {
-                                               if (!(shuffleteams_teams[i] >= pnum))
-                                               {
-                                                       if (!(shuffleteams_players[z])) continue;  // not a player, move on to next random slot
-
-                                                       entity e = NULL;
-                                                       if(VerifyClientNumber(shuffleteams_players[z]))
-                                                               e = edict_num(shuffleteams_players[z]);
-
-                                                       if(!e) continue; // unverified
-
-                                                       if (e.team != team_color) MoveToTeam(e, team_color, 6);
+                               LOG_INFO("Can't shuffle teams when currently not playing a team game.\n");
+                               return;
+                       }
 
-                                                       shuffleteams_players[z] = 0;
-                                                       shuffleteams_teams[i] = shuffleteams_teams[i] + 1;
-                                               }
-                                               else
-                                               {
-                                                       break;  // move on to next team
-                                               }
-                                       }
+                       FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, LAMBDA(
+                               if (it.team_forced) {
+                                       // we could theoretically assign forced players to their teams
+                                       // and shuffle the rest to fill the empty spots but in practise
+                                       // either all players or none are gonna have forced teams
+                                       LOG_INFO("Can't shuffle teams because at least one player has a forced team.\n");
+                                       return;
                                }
+                       ));
 
-                               bprint("Successfully shuffled the players around randomly.\n");
-
-                               // clear the buffers now
-                               for (int i = 0; i < SHUFFLETEAMS_MAX_PLAYERS; ++i)
-                                       shuffleteams_players[i] = 0;
-
-                               for (int i = 0; i < SHUFFLETEAMS_MAX_TEAMS; ++i)
-                                       shuffleteams_teams[i] = 0;
-                       }
-                       else
-                       {
-                               LOG_INFO("Can't shuffle teams when currently not playing a team game.\n");
-                       }
+                       int number_of_teams = 0;
+                       CheckAllowedTeams(NULL);
+                       if (c1 >= 0) number_of_teams = max(1, number_of_teams);
+                       if (c2 >= 0) number_of_teams = max(2, number_of_teams);
+                       if (c3 >= 0) number_of_teams = max(3, number_of_teams);
+                       if (c4 >= 0) number_of_teams = max(4, number_of_teams);
+
+                       int team_index = 0;
+                       FOREACH_CLIENT_RANDOM(IS_PLAYER(it) || it.caplayer, LAMBDA(
+                               int target_team_number = Team_NumberToTeam(team_index + 1);
+                               if (it.team != target_team_number) MoveToTeam(it, target_team_number, 6);
+                               team_index = (team_index + 1) % number_of_teams;
+                       ));
 
+                       bprint("Successfully shuffled the players around randomly.\n");
                        return;
                }