From 97be44cc1acbdfc8c47087018a29d05b9b03fb1e Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Sat, 3 Jun 2006 12:54:03 +0000 Subject: [PATCH] the gauges work in 320xXXX (sdl) again. It needs to create gauge canvases in the game when they're sub-canvases, which they were made into on 2005-08-13 --- ChangeLog | 6 ++++++ main/game.c | 6 ++---- main/gauges.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index ede9ace8..35f3a174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-03 Chris Taylor + + * main/game.c, main/gauges.c: the gauges work in 320xXXX (sdl) + again. It needs to create gauge canvases in the game when they're + sub-canvases, which they were made into on 2005-08-13 + 2006-03-05 Chris Taylor * main/inferno.c: create write directory if it doesn't exist diff --git a/main/game.c b/main/game.c index 7c25d1d6..f668e37b 100644 --- a/main/game.c +++ b/main/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.42 2005-08-07 09:58:12 chris Exp $ */ +/* $Id: game.c,v 1.43 2006-06-03 12:54:03 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char game_rcsid[] = "$Id: game.c,v 1.42 2005-08-07 09:58:12 chris Exp $"; +char game_rcsid[] = "$Id: game.c,v 1.43 2006-06-03 12:54:03 chris Exp $"; #endif #include @@ -297,8 +297,6 @@ void init_game() init_ai_system(); - init_gauge_canvases(); - init_exploding_walls(); load_background_bitmap(); diff --git a/main/gauges.c b/main/gauges.c index a7a9e415..0d278927 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -1,4 +1,4 @@ -/* $Id: gauges.c,v 1.22 2006-02-24 06:08:31 chris Exp $ */ +/* $Id: gauges.c,v 1.23 2006-06-03 12:54:03 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -2965,11 +2965,7 @@ extern short *BackBuffer; //print out some player statistics void render_gauges() { -#ifndef MACINTOSH - static int old_display_mode = 0; -#else - static int old_display_mode = 1; -#endif + static int old_display_mode = -2; int energy = f2ir(Players[Player_num].energy); int shields = f2ir(Players[Player_num].shields); int cloak = ((Players[Player_num].flags&PLAYER_FLAGS_CLOAKED) != 0); @@ -2978,10 +2974,14 @@ void render_gauges() // check to see if our display mode has changed since last render time -- // if so, then we need to make new gauge canvases. +// Also make the first gauge canvases here, in the game, +// because they are [now] sub-canvases. - if (old_display_mode != Current_display_mode) { - close_gauge_canvases(); + if (old_display_mode != Current_display_mode) + { + if (old_display_mode != -2) + close_gauge_canvases(); init_gauge_canvases(); old_display_mode = Current_display_mode; } -- 2.39.2