ref: 4963848a8f9324336450def14a119d60abdacb4e
parent: c0d6fcfe030283878714664f279bcf007e6e2a4f
author: Simon Howard <[email protected]>
date: Thu Aug 31 18:11:08 EDT 2006
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
--- 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
@@ -574,6 +574,8 @@
TryRunTics();
I_InitGraphics ();
+
+ R_ExecuteSetViewSize();
D_StartGameLoop();
--- 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 @@
+extern int detailLevel;
+extern int screenblocks;
--- 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 @@
#include "z_zone.h"
+#include "m_menu.h"
#include "m_swap.h"
#include "m_argv.h"
#include "net_client.h"
@@ -280,12 +281,6 @@
extern int viewheight;
extern int mouseSensitivity;
-extern int showMessages;
-
-extern int detailLevel;
-
-extern int screenblocks;
-
extern int showMessages;
// machine-independent sound params
--- 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 @@
#include "d_net.h"
#include "m_bbox.h"
+#include "m_menu.h"
#include "r_local.h"
#include "r_sky.h"
@@ -802,8 +803,6 @@
//
// R_Init
//
-extern int detailLevel;
-extern int screenblocks;