From 73a27983818cae259317b91999f10f769fc792ee Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 18 Apr 2005 21:21:00 +0000 Subject: [PATCH] clean up script init a bit, now starts nexuiz logo video and such only if there's nothing to do git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5197 d7cf8633-e32d-0410-b094-e92efae38249 --- host.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/host.c b/host.c index 46ca83d0..58988498 100644 --- 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 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(); } -- 2.39.2