From 808f6fd842f581f31aa0d91617a759af46fdc732 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Mon, 7 Feb 2011 01:50:40 +0000
Subject: Added graphical intro loading screen, and -nograph parameter which
 disables it. Made most D_DoomMain messages dependent on -devparm.
 wipegamestate should start == 1, which is currently GS_UNKNOWN. Changed -wart
 behavior. Verified *no* changes in Strife to p_sight.c.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2251
---
 src/strife/r_main.c | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'src/strife/r_main.c')

diff --git a/src/strife/r_main.c b/src/strife/r_main.c
index b9d9f300..0a8a639b 100644
--- a/src/strife/r_main.c
+++ b/src/strife/r_main.c
@@ -36,6 +36,7 @@
 
 #include "doomdef.h"
 #include "doomstat.h"   // villsa [STRIFE]
+#include "d_main.h"
 #include "d_net.h"
 
 #include "m_bbox.h"
@@ -782,22 +783,41 @@ void R_ExecuteSetViewSize (void)
 void R_Init (void)
 {
     R_InitData ();
-    printf (".");
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick(); // [STRIFE] tick intro
+
     R_InitPointToAngle ();
-    printf (".");
+    if(devparm)
+        printf (".");
+
     R_InitTables ();
     // viewwidth / viewheight / detailLevel are set by the defaults
-    printf (".");
+    if(devparm)
+        printf (".");
 
     R_SetViewSize (screenblocks, detailLevel);
     R_InitPlanes ();
-    printf (".");
+    if(devparm)
+        printf (".");
+    
     R_InitLightTables ();
-    printf (".");
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick();
+    
     R_InitSkyMap ();
+    if(!devparm)
+        D_IntroTick();
+
     R_InitTranslationTables ();
-    printf (".");
-	
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick();
+
     framecount = 0;
 }
 
-- 
cgit v1.2.3