From 4a78c53a8f1fe713eb11910c7c1a7e0963252217 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 17 Dec 2004 13:32:50 +0000 Subject: [PATCH] force gr_update() so screens always show in OpenGL --- ChangeLog | 3 +++ main/gameseq.c | 5 +++-- main/inferno.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8d51115..6e6f4090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * main/game.c, main/gamecntl.c, main/gameseq.c, main/multi.c, main/state.c, main/state.h: added fast save + * main/gameseq.c, main/inferno.c: force gr_update() so screens + always show in OpenGL + 2004-12-07 Chris Taylor * 2d/font.c: Initialise the dataptr member correctly. diff --git a/main/gameseq.c b/main/gameseq.c index 287d03bf..124fc0ea 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -1,4 +1,4 @@ -/* $Id: gameseq.c,v 1.42 2004-12-17 13:17:46 btb Exp $ */ +/* $Id: gameseq.c,v 1.43 2004-12-17 13:32:50 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char gameseq_rcsid[] = "$Id: gameseq.c,v 1.42 2004-12-17 13:17:46 btb Exp $"; +char gameseq_rcsid[] = "$Id: gameseq.c,v 1.43 2004-12-17 13:32:50 btb Exp $"; #endif #ifdef WINDOWS @@ -842,6 +842,7 @@ void LoadLevel(int level_num,int page_in_textures) #if 1 //defined(POLY_ACC) || defined(OGL) gr_palette_load(gr_palette); show_boxed_message(TXT_LOADING); + gr_update(); #else show_boxed_message(TXT_LOADING); gr_palette_load(gr_palette); diff --git a/main/inferno.c b/main/inferno.c index f290f7ff..19a74376 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.94 2004-12-03 10:39:49 btb Exp $ */ +/* $Id: inferno.c,v 1.95 2004-12-17 13:32:50 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -954,6 +954,7 @@ int main(int argc, char *argv[]) //vfx_set_palette_sub( title_pal ); gr_palette_clear(); gr_palette_fade_in( title_pal, 32, 0 ); + gr_update(); } else Error( "Couldn't load pcx file '%s', PCX load error: %s\n",filename, pcx_errormsg(pcx_error)); } -- 2.39.2