Remove the g_ prefix from some server code files and rename sv_main to main

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

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 6928957d6d812e6f15511d2b82e421d8f0c7f877..fe92d36673552852495602cd46b6d798450b752f 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -1,6 +1,6 @@
 #include "cmd.qh"
 
-#include <server/defs.qh>
+#include <server/world.qh>
 #include <server/miscfunctions.qh>
 
 #include <common/command/_mod.qh>
@@ -90,7 +90,7 @@ void ClientCommand_autoswitch(entity caller, int request, int argc)
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2autoswitch^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd autoswitch selection\n");
@@ -133,7 +133,7 @@ void ClientCommand_clientversion(entity caller, int request, int argc)  // inter
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2clientversion^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd clientversion version\n");
@@ -158,7 +158,7 @@ void ClientCommand_mv_getpicture(entity caller, int request, int argc)  // inter
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2mv_getpicture^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd mv_getpicture mapid\n");
@@ -248,7 +248,7 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2wpeditor^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd wpeditor action\n");
@@ -285,10 +285,13 @@ void ClientCommand_join(entity caller, int request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       if (!game_stopped)
-                       if (IS_CLIENT(caller) && !IS_PLAYER(caller))
-                       if (joinAllowed(caller))
-                               Join(caller);
+                       if (!game_stopped && IS_CLIENT(caller) && !IS_PLAYER(caller))
+                       {
+                               if (joinAllowed(caller))
+                                       Join(caller);
+                               else if(time < CS(caller).jointime + MIN_SPEC_TIME)
+                                       CS(caller).autojoin_checked = -1;
+                       }
 
                        return;  // never fall through to usage
                }
@@ -558,7 +561,7 @@ void ClientCommand_selectteam(entity caller, int request, int argc)
                        return;
                }
                default:
-                       sprint(caller, "Incorrect parameters for ^2selectteam^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd selectteam team\n");
@@ -583,7 +586,7 @@ void ClientCommand_selfstuff(entity caller, int request, string command)
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2selfstuff^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd selfstuff <command>\n");
@@ -617,7 +620,7 @@ void ClientCommand_sentcvar(entity caller, int request, int argc, string command
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2sentcvar^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd sentcvar <cvar>\n");
@@ -635,15 +638,22 @@ void ClientCommand_spectate(entity caller, int request)
                {
                        if (!intermission_running && IS_CLIENT(caller))
                        {
-                               if((IS_SPEC(caller) || IS_OBSERVER(caller)) && argv(1) != "")
+                               if(argv(1) != "")
                                {
-                                       entity client = GetFilteredEntity(argv(1));
-                                       int spec_accepted = VerifyClientEntity(client, false, false);
-                                       if(spec_accepted > 0 && IS_PLAYER(client))
+                                       if(IS_SPEC(caller) || IS_OBSERVER(caller))
                                        {
-                                               if(Spectate(caller, client))
-                                                       return; // fall back to regular handling
+                                               entity client = GetFilteredEntity(argv(1));
+                                               int spec_accepted = VerifyClientEntity(client, false, false);
+                                               if(spec_accepted > 0 && IS_PLAYER(client))
+                                               {
+                                                       Spectate(caller, client);
+                                               }
+                                               else
+                                                       sprint(caller, "can't spectate ", argv(1), "^7\n");
                                        }
+                                       else
+                                               sprint(caller, "cmd spectate client only works when you are spectator/observer\n");
+                                       return;
                                }
 
                                int mutator_returnvalue = MUTATOR_CALLHOOK(ClientCommand_Spectate, caller);
@@ -660,7 +670,7 @@ void ClientCommand_spectate(entity caller, int request)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd spectate <client>\n");
+                       sprint(caller, "\nUsage:^3 cmd spectate [client]\n");
                        sprint(caller, "  Where 'client' can be the player to spectate.\n");
                        return;
                }
@@ -681,7 +691,7 @@ void ClientCommand_suggestmap(entity caller, int request, int argc)
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2suggestmap^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd suggestmap map\n");
@@ -738,7 +748,7 @@ void ClientCommand_tell(entity caller, int request, int argc, string command)
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2tell^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd tell client <message>\n");
@@ -784,7 +794,7 @@ void ClientCommand_voice(entity caller, int request, int argc, string command)
                }
 
                default:
-                       sprint(caller, "Incorrect parameters for ^2voice^7\n");
+                       sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd voice messagetype <soundname>\n");