Merge remote-tracking branch 'origin/terencehill/bot_waypoints'

[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 bdfc52da0e16544961da36215d7d87f7e209624c..e39d5039dd8f4debe754d6487671416e401f5853 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -13,6 +13,7 @@
 #include "../campaign.qh"
 #include "../cheats.qh"
 #include "../client.qh"
+#include "../clientkill.qh"
 #include "../player.qh"
 #include "../ipban.qh"
 #include "../mapvoting.qh"
@@ -120,7 +121,7 @@ void ClientCommand_clientversion(entity caller, int request, int argc)  // inter
                                        {
                                                // JoinBestTeam(caller, false, true);
                                        }
-                                       else if (teamplay && !autocvar_sv_spectate && !(caller.team_forced > 0))
+                                       else if (teamplay && !autocvar_sv_spectate && !(Player_GetForcedTeamIndex(caller) > 0))
                                        {
                                                TRANSMUTE(Observer, caller);  // really?
                                                stuffcmd(caller, "menu_showteamselect\n");
@@ -187,6 +188,7 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                                                sprint(caller, "ERROR: this command works only if you are player\n");
                                        else
                                                waypoint_spawn_fromeditor(caller);
+                                       return;
                                }
                                else if (argv(1) == "remove")
                                {
@@ -194,6 +196,7 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                                                sprint(caller, "ERROR: this command works only if you are player\n");
                                        else
                                                waypoint_remove_fromeditor(caller);
+                                       return;
                                }
                                else if (argv(1) == "unreachable")
                                {
@@ -201,13 +204,34 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                                                sprint(caller, "ERROR: this command works only if you are player\n");
                                        else
                                                waypoint_unreachable(caller);
+                                       return;
                                }
                                else if (argv(1) == "saveall")
+                               {
                                        waypoint_saveall();
+                                       return;
+                               }
                                else if (argv(1) == "relinkall")
+                               {
                                        waypoint_schedulerelinkall();
-
-                               return;
+                                       return;
+                               }
+                               else if (argv(1) == "symaxis")
+                               {
+                                       if (argv(2) == "set" || argv(2) == "get")
+                                       {
+                                               waypoint_getSymmetricalAxis_cmd(caller, (argv(2) == "set"), 3);
+                                               return;
+                                       }
+                               }
+                               else if (argv(1) == "symorigin")
+                               {
+                                       if (argv(2) == "set" || argv(2) == "get")
+                                       {
+                                               waypoint_getSymmetricalOrigin_cmd(caller, (argv(2) == "set"), 3);
+                                               return;
+                                       }
+                               }
                        }
                }
 
@@ -216,7 +240,13 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd wpeditor action\n");
-                       sprint(caller, "  Where 'action' can be: spawn, remove, unreachable, saveall, relinkall\n");
+                       sprint(caller, "  Where 'action' can be: spawn, remove, unreachable, saveall, relinkall,\n");
+                       sprint(caller, "   symorigin get|set\n");
+                       sprint(caller, "   symorigin get|set p1 p2 ... pX\n");
+                       sprint(caller, "   symaxis get|set p1 p2\n");
+                       sprint(caller, "    where p1 p2 ... pX are positions \"x y z\" (z can be omitted)\n");
+                       sprint(caller, " symorigin and symaxis commands are useful to determine origin/axis of symmetry"
+                                                       " on maps without ctf flags or where flags aren't perfectly symmetrical\n");
                        return;
                }
        }
@@ -246,6 +276,36 @@ void ClientCommand_join(entity caller, int request)
        }
 }
 
+void ClientCommand_kill(entity caller, int request)
+{
+       switch (request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       if(IS_SPEC(caller) || IS_OBSERVER(caller))
+                               return; // no point warning about this, command does nothing
+
+                       if(GetResourceAmount(caller, RESOURCE_HEALTH) <= 0)
+                       {
+                               sprint(caller, "Can't die - you are already dead!\n");
+                               return;
+                       }
+
+                       ClientKill(caller);
+
+                       return;  // never fall through to usage
+               }
+
+               default:
+               case CMD_REQUEST_USAGE:
+               {
+                       sprint(caller, "\nUsage:^3 cmd kill\n");
+                       sprint(caller, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
 void ClientCommand_physics(entity caller, int request, int argc)
 {
        switch (request)
@@ -362,19 +422,7 @@ void ClientCommand_say_team(entity caller, int request, int argc, string command
                case CMD_REQUEST_COMMAND:
                {
                        if (argc >= 2)
-                       {
-                               string _classname = string_null;
-                               if (!IS_PLAYER(caller) && caller.caplayer)
-                               {
-                                       // CA: make work team chat for killed players
-                                       _classname = caller.classname;
-                                       caller.classname = STR_PLAYER;
-                               }
-
                                Say(caller, true, NULL, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1);
-                               if (_classname)
-                                       caller.classname = _classname;
-                       }
                        return;  // never fall through to usage
                }
 
@@ -408,7 +456,7 @@ void ClientCommand_selectteam(entity caller, int request, int argc)
                                sprint(caller, "^7selectteam can only be used in teamgames\n");
                                return;
                        }
-                       if (caller.team_forced > 0)
+                       if (Player_GetForcedTeamIndex(caller) > 0)
                        {
                                sprint(caller, "^7selectteam can not be used as your team is forced\n");
                                return;
@@ -741,6 +789,7 @@ void ClientCommand_(entity caller, int request)
        CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(ent, request, arguments), "Whether or not to switch automatically when getting a better weapon") \
        CLIENT_COMMAND("clientversion", ClientCommand_clientversion(ent, request, arguments), "Release version of the game") \
        CLIENT_COMMAND("join", ClientCommand_join(ent, request), "Become a player in the game") \
+       CLIENT_COMMAND("kill", ClientCommand_kill(ent, request), "Become a member of the dead") \
        CLIENT_COMMAND("minigame", ClientCommand_minigame(ent, request, arguments, command), "Start a minigame") \
        CLIENT_COMMAND("mv_getpicture", ClientCommand_mv_getpicture(ent, request, arguments), "Retrieve mapshot picture from the server") \
        CLIENT_COMMAND("physics", ClientCommand_physics(ent, request, arguments), "Change physics set") \