clean up script init a bit, now starts nexuiz logo video and such only if there's...

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

diff --git a/host.c b/host.c
index 46ca83d03441b4895cb29a9b294c3dc52f1164a1..58988498edf2d9728161c40d23dd4efa3988dae7 100644 (file)
--- a/host.c
+++ b/host.c
@@ -924,11 +924,16 @@ void Host_Init (void)
                CL_Init();
        }
 
+       Cbuf_Execute();
+
        // only cvars are executed when host_initialized == false
        if (gamemode == GAME_TEU)
                Cbuf_InsertText("exec teu.rc\n");
        else
                Cbuf_InsertText("exec quake.rc\n");
+
+       Cbuf_Execute();
+       Cbuf_Execute();
        Cbuf_Execute();
 
        host_initialized = true;
@@ -978,22 +983,37 @@ void Host_Init (void)
        Cbuf_Execute();
        Cbuf_Execute();
 
-       if (!sv.active && (cls.state == ca_dedicated || COM_CheckParm("-listen")))
+       // We must wait for the log_file cvar to be initialized to start the log
+       Log_Start ();
+
+       if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
+       if (!sv.active && !cls.demoplayback && !cls.connect_trying)
                Cbuf_InsertText ("startmap_dm\n");
 
+       Cbuf_Execute();
+
        // check for special benchmark mode
 // COMMANDLINEOPTION: Client: -benchmark <demoname> runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log)
        i = COM_CheckParm("-benchmark");
-       if (i && i + 1 < com_argc && !sv.active)
+       if (i && i + 1 < com_argc)
+       if (!sv.active && !cls.demoplayback && !cls.connect_trying)
                Cbuf_InsertText(va("timedemo %s\n", com_argv[i + 1]));
 
+       Cbuf_Execute();
+
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
+       {
                Cbuf_InsertText("togglemenu\n");
+               if (gamemode == GAME_NEXUIZ)
+               {
+                       Cbuf_InsertText("playvideo logo\n");
+                       Cbuf_InsertText("cd loop 1\n");
+               }
+       }
 
        Cbuf_Execute();
-
-       // We must wait for the log_file cvar to be initialized to start the log
-       Log_Start ();
+       Cbuf_Execute();
+       Cbuf_Execute();
 }