Revert "Merge branch 'TimePath/bot_api' into 'master'\r"

[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 6c3d4c669df079183de55a82f90c63a904e5d06c..d08588ff99c1a3501fe28992bee5329c1654b7c5 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -209,8 +209,7 @@ void GameCommand_allspec(float request, float argc)
                        {
                                if (client.caplayer)
                                        client.caplayer = 0;
-                               SELFCALL(client, PutObserverInServer());
-                               SELFCALL_DONE();
+                               WITH(entity, self, client, PutObserverInServer());
                                ++i;
                        }
                        if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); }
@@ -240,8 +239,7 @@ void GameCommand_anticheat(float request, float argc)
 
                        if(accepted > 0)
                        {
-                               SELFCALL(client, anticheat_report());
-                               SELFCALL_DONE();
+                               WITH(entity, self, client, anticheat_report());
                                return;
                        }
                        else
@@ -818,11 +816,11 @@ void GameCommand_gettaginfo(float request, float argc)
                        {
                                tmp_entity = spawn();
                                if(argv(1) == "w")
-                                       setmodel(tmp_entity, (nextent(world)).weaponentity.model);
+                                       _setmodel(tmp_entity, (nextent(world)).weaponentity.model);
                                else
                                {
                                        precache_model(argv(1));
-                                       setmodel(tmp_entity, argv(1));
+                                       _setmodel(tmp_entity, argv(1));
                                }
                                tmp_entity.frame = stof(argv(2));
                                if(substring(argv(3), 0, 1) == "#")
@@ -876,11 +874,11 @@ void GameCommand_animbench(float request, float argc)
                        {
                                tmp_entity = spawn();
                                if(argv(1) == "w")
-                                       setmodel(tmp_entity, (nextent(world)).weaponentity.model);
+                                       _setmodel(tmp_entity, (nextent(world)).weaponentity.model);
                                else
                                {
                                        precache_model(argv(1));
-                                       setmodel(tmp_entity, argv(1));
+                                       _setmodel(tmp_entity, argv(1));
                                }
                                float f1 = stof(argv(2));
                                float f2 = stof(argv(3));
@@ -1041,8 +1039,7 @@ void GameCommand_moveplayer(float request, float argc)
                                                {
                                                        if (client.caplayer)
                                                                client.caplayer = 0;
-                                                       SELFCALL(client, PutObserverInServer());
-                                                       SELFCALL_DONE();
+                                                       WITH(entity, self, client, PutObserverInServer());
 
                                                        successful = strcat(successful, (successful ? ", " : ""), client.netname);
                                                }
@@ -1194,8 +1191,7 @@ void GameCommand_playerdemo(float request, float argc)
                                                        return;
                                                }
 
-                                               SELFCALL(client, playerdemo_open_read(argv(next_token)));
-                                               SELFCALL_DONE();
+                                               WITH(entity, self, client, playerdemo_open_read(argv(next_token)));
                                                return;
                                        }
 
@@ -1210,8 +1206,7 @@ void GameCommand_playerdemo(float request, float argc)
                                                        return;
                                                }
 
-                                               SELFCALL(client, playerdemo_open_write(argv(next_token)));
-                                               SELFCALL_DONE();
+                                               WITH(entity, self, client, playerdemo_open_write(argv(next_token)));
                                                return;
                                        }