summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-09-26 21:44:30 +0000
committerSimon Howard2005-09-26 21:44:30 +0000
commit308464a060a878728c15feaf53ac205fb49a717a (patch)
tree28bb9d9a488d094396059076778a4d093965cbfb
parent33fa8bcf625e35c8d9afbaf1f87b7f6b463baafd (diff)
downloadchocolate-doom-308464a060a878728c15feaf53ac205fb49a717a.tar.gz
chocolate-doom-308464a060a878728c15feaf53ac205fb49a717a.tar.bz2
chocolate-doom-308464a060a878728c15feaf53ac205fb49a717a.zip
Fix melting crap on startup - oops
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 134
-rw-r--r--src/i_video.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/i_video.c b/src/i_video.c
index 7de7977d..903883ff 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: i_video.c 133 2005-09-25 00:31:32Z fraggle $
+// $Id: i_video.c 134 2005-09-26 21:44:30Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.32 2005/09/26 21:44:30 fraggle
+// Fix melting crap on startup - oops
+//
// Revision 1.31 2005/09/25 00:31:32 fraggle
// Fix disk icon appearing before palette is set (pink disk!)
// Cleanup and commenting
@@ -134,7 +137,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: i_video.c 133 2005-09-25 00:31:32Z fraggle $";
+rcsid[] = "$Id: i_video.c 134 2005-09-26 21:44:30Z fraggle $";
#include <SDL.h>
#include <ctype.h>
@@ -818,7 +821,6 @@ void I_InitGraphics(void)
// start with a clear black screen
- memset(screens[0], 0, SCREENWIDTH * SCREENHEIGHT);
I_SetPalette (W_CacheLumpName ("PLAYPAL",PU_CACHE));
SDL_Flip(screen);
@@ -847,6 +849,8 @@ void I_InitGraphics(void)
else
screens[0] = (unsigned char *) Z_Malloc (SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
+ memset(screens[0], 0, SCREENWIDTH * SCREENHEIGHT);
+
// Loading from disk icon
LoadDiskImage();