From 4e18953e406697d5a227d6e618958d46bc6da6ad Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Sat, 26 Feb 2005 09:30:04 +0000 Subject: [PATCH] determine properly if 800x600 resolution is available --- ChangeLog | 3 +++ main/inferno.c | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d334f3b8..86cea5be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ * main/bmread.c, main/inferno.c: if EDITOR is defined, game still works if there's no BITMAPS.TBL in a PhysicsFS search path + * main/inferno.c: determine properly if 800x600 resolution is + available (for editor) + 2005-02-25 Chris Taylor * arch/carbon/conf.h, D2X.make: no defining OGL in conf.h, diff --git a/main/inferno.c b/main/inferno.c index 7b964193..85aa129f 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.99 2005-02-26 07:04:47 chris Exp $ */ +/* $Id: inferno.c,v 1.100 2005-02-26 09:30:04 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -142,10 +142,6 @@ int Screen_mode=-1; //game screen or editor screen? int WVIDEO_running=0; //debugger can set to 1 if running -#ifdef EDITOR -int Inferno_is_800x600_available = 0; -#endif - //--unused-- int Cyberman_installed=0; // SWIFT device present ubyte CybermouseActive=0; @@ -673,7 +669,8 @@ int main(int argc, char *argv[]) // if (init_graphics()) return 1; #ifdef EDITOR - if (!Inferno_is_800x600_available) { + if (gr_check_mode(SM(800, 600)) != 0) + { con_printf(CON_NORMAL, "The editor will not be available, press any key to start game...\n" ); Function_mode = FMODE_MENU; } -- 2.39.2