[Freedroid-cvslog] FreeDroid/src menu.c,1.272,1.273 misc.c,1.297,1.298

[<joh...@us...>]

Update of /cvsroot/freedroid/FreeDroid/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27736

Modified Files:
	menu.c misc.c 
Log Message:
* Final fixes concerning the screen resolution from inside the game.


Index: menu.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/menu.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** menu.c	24 Feb 2004 19:06:02 -0000	1.272
--- menu.c	24 Feb 2004 19:14:14 -0000	1.273
***************
*** 1685,1689 ****
  	    case CHANGE_SCREEN_RESOLUTION:
  		while (EnterPressed() || SpacePressed() );
! 		Change_Screen_Resolution_Menu();
  		break;
  		
--- 1685,1706 ----
  	    case CHANGE_SCREEN_RESOLUTION:
  		while (EnterPressed() || SpacePressed() );
! 		if ( ! use_open_gl )
! 		{
! 		    GiveMouseAlertWindow ( "\n\
! You are using SDL instead of OpenGL\n\
! for graphics ouput right now.\n\
! \n\
! Other screen resolutions than 640x480\n\
! are currently now supported with SDL.\n\
! \n\
! You might want to restart the game using\n\
! OpenGL instead.  Then you can change the\n\
! screen resolution using this menu option.\n\
! \n\
! Thanks you.\n");
! 		    SetCurrentFont ( Menu_BFont );
! 		}
! 		else
! 		    Change_Screen_Resolution_Menu();
  		break;
  		

Index: misc.c
===================================================================
RCS file: /cvsroot/freedroid/FreeDroid/src/misc.c,v
retrieving revision 1.297
retrieving revision 1.298
diff -C2 -d -r1.297 -r1.298
*** misc.c	24 Feb 2004 19:06:03 -0000	1.297
--- misc.c	24 Feb 2004 19:14:14 -0000	1.298
***************
*** 1586,1589 ****
--- 1586,1607 ----
      }
  
+     //--------------------
+     // If the user is using SDL for the graphics output, then no other
+     // screen resolutions than 640x480 will be available.
+     //
+     if ( ( ! use_open_gl ) && ( GameConfig . screen_width != 640 ) )
+     {
+ 	GameConfig . screen_width = 640; 
+ 	GameConfig . screen_height = 480 ;
+ 	GiveStandardErrorMessage ( __FUNCTION__  , "\
+ You are using SDL instead of OpenGL for graphics output.  For this\n\
+ output method, no other screen resolutions than 640x480 is available.\n\
+ Therefore your setting will be overridden and 640x480 will be used.\n\
+ If you want different resolutions, please use OpenGL for graphics\n\
+ output.",
+ 				   NO_NEED_TO_INFORM , IS_WARNING_ONLY );
+     }
+ 
+ 
      return (OK);