TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

determine properly if 800x600 resolution is available

Browse source
This commit is contained in:
Chris Taylor 2005-02-26 09:30:04 +00:00
parent d038b22379
commit 4e18953e40
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -11,6 +11,9 @@
* main/bmread.c, main/inferno.c: if EDITOR is defined, game * main/bmread.c, main/inferno.c: if EDITOR is defined, game
still works if there's no BITMAPS.TBL in a PhysicsFS search path 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 <chris@icculus.org> 2005-02-25 Chris Taylor <chris@icculus.org>
* arch/carbon/conf.h, D2X.make: no defining OGL in conf.h, * arch/carbon/conf.h, D2X.make: no defining OGL in conf.h,

9
main/inferno.c
View file

@ -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 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO 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 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 //--unused-- int Cyberman_installed=0; // SWIFT device present
ubyte CybermouseActive=0; ubyte CybermouseActive=0;
@ -673,7 +669,8 @@ int main(int argc, char *argv[])
// if (init_graphics()) return 1; // if (init_graphics()) return 1;
#ifdef EDITOR #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" ); con_printf(CON_NORMAL, "The editor will not be available, press any key to start game...\n" );
Function_mode = FMODE_MENU; Function_mode = FMODE_MENU;
} }