Cleanse server client commands

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / sv_minigames.qc

diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc
index bde942616b66ee9a46952c0bab8247d7ad946ad3..499959302ac5d7db2ce4b68102489003445f46df 100644 (file)
--- a/qcsrc/common/minigames/sv_minigames.qc
+++ b/qcsrc/common/minigames/sv_minigames.qc
@@ -303,11 +303,11 @@ bool MinigameImpulse(entity this, int imp)
 
 
 
-void ClientCommand_minigame(int request, int argc, string command)
-{SELFPARAM();
+void ClientCommand_minigame(entity caller, int request, int argc, string command)
+{
        if ( !autocvar_sv_minigames )
        {
-               sprint(self,"Minigames are not enabled!\n");
+               sprint(caller,"Minigames are not enabled!\n");
                return;
        }
 
@@ -316,88 +316,88 @@ void ClientCommand_minigame(int request, int argc, string command)
                string minig_cmd = argv(1);
                if ( minig_cmd == "create" && argc > 2 )
                {
-                       entity minig = start_minigame(self, argv(2));
+                       entity minig = start_minigame(caller, argv(2));
                        if ( minig )
-                               sprint(self,"Created minigame session: ",minig.netname,"\n");
+                               sprint(caller,"Created minigame session: ",minig.netname,"\n");
                        else
-                               sprint(self,"Cannot start minigame session!\n");
+                               sprint(caller,"Cannot start minigame session!\n");
                        return;
                }
                else if ( minig_cmd == "join" && argc > 2 )
                {
-                       entity minig = join_minigame(self, argv(2));
+                       entity minig = join_minigame(caller, argv(2));
                        if ( minig )
-                               sprint(self,"Joined: ",minig.netname,"\n");
+                               sprint(caller,"Joined: ",minig.netname,"\n");
                        else
                        {
-                               Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_JOIN_PREVENT_MINIGAME);
-                               sprint(self,"Cannot join given minigame session!\n");
+                               Send_Notification(NOTIF_ONE, caller, MSG_CENTER, CENTER_JOIN_PREVENT_MINIGAME);
+                               sprint(caller,"Cannot join given minigame session!\n");
                        }
                        return;
                }
                else if ( minig_cmd == "list" )
                {
-                       FOREACH(Minigames, true, sprint(self, it.netname, " (", it.message, ") ", "\n"));
+                       FOREACH(Minigames, true, sprint(caller, it.netname, " (", it.message, ") ", "\n"));
                        return;
                }
                else if ( minig_cmd == "list-sessions" )
                {
                        entity e;
                        for ( e = minigame_sessions; e != world; e = e.list_next )
-                               sprint(self,e.netname,"\n");
+                               sprint(caller,e.netname,"\n");
                        return;
                }
                else if ( minig_cmd == "end" || minig_cmd == "part" )
                {
-                       if ( self.active_minigame )
+                       if ( caller.active_minigame )
                        {
-                               part_minigame(self);
-                               sprint(self,"Left minigame session\n");
+                               part_minigame(caller);
+                               sprint(caller,"Left minigame session\n");
                        }
                        else
-                               sprint(self,"You aren't playing any minigame...\n");
+                               sprint(caller,"You aren't playing any minigame...\n");
                        return;
                }
                else if ( minig_cmd == "invite" && argc > 2 )
                {
-                       if ( self.active_minigame )
+                       if ( caller.active_minigame )
                        {
                                entity client = GetIndexedEntity(argc, 2);
-                               string error = invite_minigame(self,client);
+                               string error = invite_minigame(caller,client);
                                if ( error == "" )
                                {
-                                       sprint(self,"You have invited ",client.netname,
-                                               " to join your game of ", self.active_minigame.descriptor.message, "\n");
+                                       sprint(caller,"You have invited ",client.netname,
+                                               " to join your game of ", caller.active_minigame.descriptor.message, "\n");
                                }
                                else
-                                       sprint(self,"Could not invite: ", error, ".\n");
+                                       sprint(caller,"Could not invite: ", error, ".\n");
                        }
                        else
-                               sprint(self,"You aren't playing any minigame...\n");
+                               sprint(caller,"You aren't playing any minigame...\n");
                        return;
                }
-               else if ( self.active_minigame )
+               else if ( caller.active_minigame )
                {
-                       entity e = minigame_find_player(self);
+                       entity e = minigame_find_player(caller);
                        string subcommand = substring(command,argv_end_index(0),-1);
                        int arg_c = tokenize_console(subcommand);
-                       if ( self.active_minigame.minigame_event(self.active_minigame,"cmd",e,arg_c,subcommand) )
+                       if ( caller.active_minigame.minigame_event(caller.active_minigame,"cmd",e,arg_c,subcommand) )
                                return;
 
                }
-               else sprint(self,strcat("Wrong command:^1 ",command,"\n"));
+               else sprint(caller,strcat("Wrong command:^1 ",command,"\n"));
        }
 
-       sprint(self, "\nUsage:^3 cmd minigame create <minigame>\n");
-       sprint(self, "  Start a new minigame session\n");
-       sprint(self, "Usage:^3 cmd minigame join <session>\n");
-       sprint(self, "  Join an exising minigame session\n");
-       sprint(self, "Usage:^3 cmd minigame list\n");
-       sprint(self, "  List available minigames\n");
-       sprint(self, "Usage:^3 cmd minigame list-sessions\n");
-       sprint(self, "  List available minigames sessions\n");
-       sprint(self, "Usage:^3 cmd minigame part|end\n");
-       sprint(self, "  Leave the current minigame\n");
-       sprint(self, "Usage:^3 cmd minigame invite <player>\n");
-       sprint(self, "  Invite the given player to join you in a minigame\n");
+       sprint(caller, "\nUsage:^3 cmd minigame create <minigame>\n");
+       sprint(caller, "  Start a new minigame session\n");
+       sprint(caller, "Usage:^3 cmd minigame join <session>\n");
+       sprint(caller, "  Join an exising minigame session\n");
+       sprint(caller, "Usage:^3 cmd minigame list\n");
+       sprint(caller, "  List available minigames\n");
+       sprint(caller, "Usage:^3 cmd minigame list-sessions\n");
+       sprint(caller, "  List available minigames sessions\n");
+       sprint(caller, "Usage:^3 cmd minigame part|end\n");
+       sprint(caller, "  Leave the current minigame\n");
+       sprint(caller, "Usage:^3 cmd minigame invite <player>\n");
+       sprint(caller, "  Invite the given player to join you in a minigame\n");
 }