From 4963848a8f9324336450def14a119d60abdacb4e Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 31 Aug 2006 22:11:08 +0000
Subject: Call R_ExecuteSetViewSize immediately after calling I_InitGraphics.
 I_InitGraphics can change where screens[0] points to, so the player can end
 up with a blank screen sometimes. Thanks to Kurn for reporting this.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 591
---
 src/d_main.c |  6 ++++--
 src/m_menu.h |  4 +++-
 src/m_misc.c | 11 +++--------
 src/r_main.c |  7 +++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 9e74eb3b..7d26fa3f 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 582 2006-08-31 18:13:23Z fraggle $
+// $Id: d_main.c 591 2006-08-31 22:11:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -184,7 +184,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 582 2006-08-31 18:13:23Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 591 2006-08-31 22:11:08Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -575,6 +575,8 @@ void D_DoomLoop (void)
 
     I_InitGraphics ();
 
+    R_ExecuteSetViewSize();
+
     D_StartGameLoop();
 
     while (1)
diff --git a/src/m_menu.h b/src/m_menu.h
index f4595620..ac778bdd 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_menu.h 8 2005-07-23 16:44:57Z fraggle $
+// $Id: m_menu.h 591 2006-08-31 22:11:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -63,6 +63,8 @@ void M_StartControlPanel (void);
 
 
 
+extern int detailLevel;
+extern int screenblocks;
 
 
 
diff --git a/src/m_misc.c b/src/m_misc.c
index 31cc5723..95cc0595 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_misc.c 581 2006-08-31 18:13:04Z fraggle $
+// $Id: m_misc.c 591 2006-08-31 22:11:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -106,7 +106,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_misc.c 581 2006-08-31 18:13:04Z fraggle $";
+rcsid[] = "$Id: m_misc.c 591 2006-08-31 22:11:08Z fraggle $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -127,6 +127,7 @@ rcsid[] = "$Id: m_misc.c 581 2006-08-31 18:13:04Z fraggle $";
 
 #include "z_zone.h"
 
+#include "m_menu.h"
 #include "m_swap.h"
 #include "m_argv.h"
 #include "net_client.h"
@@ -282,12 +283,6 @@ extern int	viewheight;
 extern int	mouseSensitivity;
 extern int	showMessages;
 
-extern int	detailLevel;
-
-extern int	screenblocks;
-
-extern int	showMessages;
-
 // machine-independent sound params
 extern	int	numChannels;
 
diff --git a/src/r_main.c b/src/r_main.c
index bde0f596..bbb3b610 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: r_main.c 474 2006-05-03 19:23:54Z fraggle $
+// $Id: r_main.c 591 2006-08-31 22:11:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -49,7 +49,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: r_main.c 474 2006-05-03 19:23:54Z fraggle $";
+static const char rcsid[] = "$Id: r_main.c 591 2006-08-31 22:11:08Z fraggle $";
 
 
 
@@ -61,6 +61,7 @@ static const char rcsid[] = "$Id: r_main.c 474 2006-05-03 19:23:54Z fraggle $";
 #include "d_net.h"
 
 #include "m_bbox.h"
+#include "m_menu.h"
 
 #include "r_local.h"
 #include "r_sky.h"
@@ -802,8 +803,6 @@ void R_ExecuteSetViewSize (void)
 //
 // R_Init
 //
-extern int	detailLevel;
-extern int	screenblocks;
 
 
 
-- 
cgit v1.2.3