removed -demolooponly commandline option as it did precisely the same thing as -demo...

corrected a mention of host_maxfps to cl_maxfps in host_framerate cvar description

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6958 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_demo.c b/cl_demo.c
index f4a4cf4ce90104bbd3c34581922a0e8c221c03ce..0f92f2ce16fa25b223ff2159e4afc25762d2cd41 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -87,7 +87,7 @@ void CL_StopPlayback (void)
        if (cls.timedemo)
                CL_FinishTimeDemo ();
 
-       if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+       if (COM_CheckParm("-demo"))
                Host_Quit_f();
 
 }

diff --git a/host.c b/host.c
index a9050113221d2280bf956332a08df2a15f741a87..31dd39c95ef2f1dd01d20eb5c55069ff17254b1b 100644 (file)
--- a/host.c
+++ b/host.c
@@ -56,7 +56,7 @@ jmp_buf host_abortframe;
 cvar_t sv_random_seed = {0, "sv_random_seed", "", "random seed; when set, on every map start this random seed is used to initialize the random number generator. Don't touch it unless for benchmarking or debugging"};
 
 // pretend frames take this amount of time (in seconds), 0 = realtime
-cvar_t host_framerate = {0, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use host_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"};
+cvar_t host_framerate = {0, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"};
 // shows time used by certain subsystems
 cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
 // LordHavoc: framerate independent slowmo
@@ -1048,16 +1048,6 @@ static void Host_Init (void)
                Cbuf_Execute();
        }
 
-       // check for special demolooponly mode
-// COMMANDLINEOPTION: Client: -demolooponly <demoname> runs a playdemo and quits
-       i = COM_CheckParm("-demolooponly");
-       if (i && i + 1 < com_argc)
-       if (!sv.active && !cls.demoplayback && !cls.connect_trying)
-       {
-               Cbuf_AddText(va("playdemo %s\n", com_argv[i + 1]));
-               Cbuf_Execute();
-       }
-
        if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
        {

diff --git a/host_cmd.c b/host_cmd.c
index 34be8b7cff0408f1efb5a0360039d2551dd222e3..9307316d00cc615971d2824362db26b868541b98 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1925,7 +1925,7 @@ void Host_Startdemos_f (void)
 {
        int             i, c;
 
-       if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+       if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo"))
                return;
 
        c = Cmd_Argc() - 1;