[Widelands-cvs] SF.net SVN: widelands:[3734] trunk/src

[<nas...@us...>]

Revision: 3734
          http://widelands.svn.sourceforge.net/widelands/?rev=3734&view=rev
Author:   nasenbaer_peter
Date:     2009-03-19 12:09:08 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Move XRES and YRES to constants.h where they actually belong and use this variable in wlapplication.cc as well as fix a part of a function in wlapplication.cc which was once written for the static sized menu

Modified Paths:
--------------
    trunk/src/constants.h
    trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc
    trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h
    trunk/src/wlapplication.cc

Modified: trunk/src/constants.h
===================================================================
--- trunk/src/constants.h	2009-03-18 23:42:15 UTC (rev 3733)
+++ trunk/src/constants.h	2009-03-19 12:09:08 UTC (rev 3734)
@@ -30,12 +30,16 @@
 
 /** \name Textures
  * textures have a fixed size and are squares
- * TEXTURE_HEIGHT is just defined for easier understandement of the code*/
+ * TEXTURE_HEIGHT is just defined for easier understandement of the code
+ */
 //@{
 #define TEXTURE_WIDTH 64
 #define TEXTURE_HEIGHT TEXTURE_WIDTH
 //@}
 
+#define XRES 800 ///< Fullscreen Menu Width
+#define YRES 600 ///< Fullscreen Menu Height
+
 /// \name Fonts
 /// Font constants, defined including size
 //@{

Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc	2009-03-18 23:42:15 UTC (rev 3733)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc	2009-03-19 12:09:08 UTC (rev 3734)
@@ -78,11 +78,11 @@
 
 
 uint32_t Fullscreen_Menu_Base::gr_x() {
-	return g_options.pull_section("global").get_int("xres", MENU_XRES);
+	return g_options.pull_section("global").get_int("xres", XRES);
 }
 
 uint32_t Fullscreen_Menu_Base::gr_y() {
-	return g_options.pull_section("global").get_int("yres", MENU_YRES);
+	return g_options.pull_section("global").get_int("yres", YRES);
 }
 
 

Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h	2009-03-18 23:42:15 UTC (rev 3733)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h	2009-03-19 12:09:08 UTC (rev 3734)
@@ -23,9 +23,6 @@
 #include "ui_panel.h"
 #include <string>
 
-#define MENU_XRES 800 ///< Fullscreen Menu Width
-#define MENU_YRES 600 ///< Fullscreen Menu Height
-
 /**
  * This class is the base class for a fullscreen menu.
  * A fullscreen menu is a menu which takes the full screen; it has the size

Modified: trunk/src/wlapplication.cc
===================================================================
--- trunk/src/wlapplication.cc	2009-03-18 23:42:15 UTC (rev 3733)
+++ trunk/src/wlapplication.cc	2009-03-19 12:09:08 UTC (rev 3734)
@@ -752,13 +752,8 @@
 	SDL_EnableUNICODE(1); //needed by helper.h:is_printable()
 	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
-	uint32_t xres = 800;
-	uint32_t yres = 600;
-	if (m_loadgame_filename.size() or m_scenario_filename.size()) {
-		// main menu will not be shown, so set in-game resolution
-		xres = s.get_int("xres", xres);
-		yres = s.get_int("yres", yres);
-	}
+	uint32_t xres = s.get_int("xres", XRES);
+	uint32_t yres = s.get_int("yres", YRES);
 
 	init_graphics(xres, yres, s.get_int("depth", 16), m_gfx_fullscreen);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.