]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Didnt know that Host_StartVideo works this way (called randomly around the code)...
authorblack <black@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 2 Jun 2005 19:21:26 +0000 (19:21 +0000)
committerblack <black@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 2 Jun 2005 19:21:26 +0000 (19:21 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5381 d7cf8633-e32d-0410-b094-e92efae38249

host.c

diff --git a/host.c b/host.c
index abbbff181452e2ca4f75ac0e64ec951210196ddd..385a1c2bbd20092067566345577d41eac7a172d1 100644 (file)
--- a/host.c
+++ b/host.c
@@ -1027,6 +1027,20 @@ void Host_Init (void)
        // save console log up to this point to log_file if it was set by configs
        Log_Start();
 
+       // FIXME: put this into some neat design, but the menu should be allowed to crash
+       // without crashing the whole game, so this should just be a short-time solution
+       Host_StartVideo();
+
+       // here comes the not so critical stuff
+       if (setjmp(host_abortframe)) {
+               return;
+       }
+
+       if (cls.state != ca_dedicated)
+       {
+               MR_Init();
+       }
+
        // 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");
@@ -1056,19 +1070,6 @@ void Host_Init (void)
        Con_DPrint("========Initialized=========\n");
 
        Host_StartVideo();
-
-       // FIXME: put this into some neat design, but the menu should be allowed to crash
-       // without crashing the whole game, so this should just be a short-time solution
-
-       // here comes the not so critical stuff
-       if (setjmp(host_abortframe)) {
-               return;
-       }
-
-       if (vid_opened && cls.state != ca_dedicated)
-       {
-               MR_Init();
-       }
 }