fixed Prydon Gate behavior regarding the start map (which immediately changes level)

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index 43633d823e590e7687b348db4463f55a45547a47..6ef5247ef74a8a5a9c7c85d1e11d3e9210aa034d 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -24,6 +24,9 @@ int current_skill;
 char sv_spawnmap[MAX_QPATH];
 char sv_loadgame[MAX_OSPATH];
 
+cvar_t sv_cheats = {0, "sv_cheats", "0"};
+qboolean allowcheats = false;
+
 mfunction_t *ED_FindFunction (char *name);
 
 /*
@@ -109,8 +112,14 @@ void Host_God_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch || !sv_player)
+       if (!sv_player)
+               return;
+
+       if (!allowcheats)
+       {
+               SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
                return;
+       }
 
        sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE;
        if (!((int)sv_player->v->flags & FL_GODMODE) )
@@ -127,9 +136,15 @@ void Host_Notarget_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch || !sv_player)
+       if (!sv_player)
                return;
 
+       if (!allowcheats)
+       {
+               SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
        sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET;
        if (!((int)sv_player->v->flags & FL_NOTARGET) )
                SV_ClientPrintf ("notarget OFF\n");
@@ -147,9 +162,15 @@ void Host_Noclip_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch || !sv_player)
+       if (!sv_player)
                return;
 
+       if (!allowcheats)
+       {
+               SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
        if (sv_player->v->movetype != MOVETYPE_NOCLIP)
        {
                noclip_anglehack = true;
@@ -179,9 +200,15 @@ void Host_Fly_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch || !sv_player)
+       if (!sv_player)
                return;
 
+       if (!allowcheats)
+       {
+               SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
        if (sv_player->v->movetype != MOVETYPE_FLY)
        {
                sv_player->v->movetype = MOVETYPE_FLY;
@@ -259,6 +286,8 @@ void Host_Map_f (void)
 
        svs.serverflags = 0;                    // haven't completed an episode yet
        strcpy (sv_spawnmap, Cmd_Argv(1));
+       if (host_initialized)
+               Host_PerformSpawnServerAndLoadGame();
 }
 
 /*
@@ -282,6 +311,8 @@ void Host_Changelevel_f (void)
        }
        SV_SaveSpawnparms ();
        strcpy (sv_spawnmap, Cmd_Argv(1));
+       if (host_initialized)
+               Host_PerformSpawnServerAndLoadGame();
 }
 
 /*
@@ -299,6 +330,8 @@ void Host_Restart_f (void)
        if (cmd_source != src_command)
                return;
        strcpy (sv_spawnmap, sv.name);
+       if (host_initialized)
+               Host_PerformSpawnServerAndLoadGame();
 }
 
 /*
@@ -537,6 +570,7 @@ void Host_PerformLoadGame(char *name)
        str = FS_Getline (f);
        sscanf (str, "%f\n",&time);
 
+       allowcheats = sv_cheats.integer != 0;
        SV_SpawnServer (mapname);
        if (!sv.active)
        {
@@ -1172,15 +1206,7 @@ void Host_Kick_f (void)
        int i;
        qboolean byNumber = false;
 
-       if (cmd_source == src_command)
-       {
-               if (!sv.active)
-               {
-                       Cmd_ForwardToServer ();
-                       return;
-               }
-       }
-       else if (pr_global_struct->deathmatch)
+       if (cmd_source != src_command || !sv.active)
                return;
 
        save = host_client;
@@ -1268,9 +1294,15 @@ void Host_Give_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch || !sv_player)
+       if (!sv_player)
                return;
 
+       if (!allowcheats)
+       {
+               SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
        t = Cmd_Argv(1);
        v = atoi (Cmd_Argv(2));
 
@@ -1617,11 +1649,14 @@ void Host_PerformSpawnServerAndLoadGame(void)
        if (sv_loadgame[0])
                Host_PerformLoadGame(sv_loadgame);
        else if (sv_spawnmap[0])
+       {
+               allowcheats = sv_cheats.integer != 0;
                SV_SpawnServer(sv_spawnmap);
+       }
        sv_loadgame[0] = 0;
        sv_spawnmap[0] = 0;
        if (sv.active && cls.state == ca_disconnected)
-               Cmd_ExecuteString ("connect local", src_command);
+               Cbuf_AddText ("connect local");
 }
 
 //=============================================================================
@@ -1688,5 +1723,7 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
        Cmd_AddCommand ("spawn", Host_Spawn_f);
        Cmd_AddCommand ("begin", Host_Begin_f);
+
+       Cvar_RegisterVariable(&sv_cheats);
 }