Merge lp:~widelands-dev/widelands/normalize_requirements into lp:widelands

[SirVer]

This branch contains three changes:

1) minimum resolution is now 800x600 - we had this as the default for the menus forever now. As of this month I do not own a device that has a smaller default resolution (even my phones show more pixels). So I feel it is time to up the minimal resolution.
2) drop support for 16 bit. I did not change the graphics code, but the options no longer show 16 bit resolutions. 16 bit is slow, not supported for opengl at all and some code expects to be run in 32 bit already - running 16 bit will cost us expensive translations. The times are also over where we were concerned about using twice the ram pre pixel. Defaulting to 32 bit means that we can get rid of some special casing in the longer run.
3) rotate the stock menu/warehous again to be taller then wide. There was general agreement back in the day that this looks better and disturbs less while playing - but we had to support 640x480 resolution and the content didn't fit. Now the menus fit, though the edges of the windows go a little outside of the window at 800x600 - all buttons are clickable and all texts are readable.

[cghislai (charlyghislain)]

Looks good to me. The only window not entirely fitting is the ware statistics menu.

[SirVer (sirver)]

Thanks for the review. Merged.

=== modified file 'src/constants.h'
--- src/constants.h	2013-07-19 16:13:42 +0000
+++ src/constants.h	2013-07-21 15:08:25 +0000
@@ -41,9 +41,9 @@
 #define XRES 800 ///< Fullscreen Menu Width
 #define YRES 600 ///< Fullscreen Menu Height
 
-#define FALLBACK_GRAPHICS_WIDTH 640
-#define FALLBACK_GRAPHICS_HEIGHT 480
-#define FALLBACK_GRAPHICS_DEPTH 16
+#define FALLBACK_GRAPHICS_WIDTH 800
+#define FALLBACK_GRAPHICS_HEIGHT 600
+#define FALLBACK_GRAPHICS_DEPTH 32
 
 /// \name Fonts
 /// Font constants, defined including size

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2013-07-21 08:25:22 +0000
+++ src/ui_fsmenu/options.cc	2013-07-21 15:08:25 +0000
@@ -238,26 +238,6 @@
 	// take a copy to not change real video info structure
 	SDL_PixelFormat fmt = *SDL_GetVideoInfo()->vfmt;
 
-	fmt.BitsPerPixel = 16;
-	for
-		(const SDL_Rect * const * modes = SDL_ListModes(&fmt, SDL_SWSURFACE | SDL_FULLSCREEN);
-		 modes && *modes;
-		 ++modes)
-	{
-		const SDL_Rect & mode = **modes;
-		if (640 <= mode.w and 480 <= mode.h)
-		{
-			const Resolution this_res = {mode.w, mode.h, fmt.BitsPerPixel};
-			if
-				(m_resolutions.empty()
-				 || this_res.xres != m_resolutions.rbegin()->xres
-				 || this_res.yres != m_resolutions.rbegin()->yres)
-			{
-				m_resolutions.push_back(this_res);
-			}
-		}
-	}
-
 	fmt.BitsPerPixel = 32;
 	for
 		(const SDL_Rect * const * modes = SDL_ListModes(&fmt, SDL_SWSURFACE | SDL_FULLSCREEN);
@@ -265,7 +245,7 @@
 		 ++modes)
 	{
 		const SDL_Rect & mode = **modes;
-		if (640 <= mode.w and 480 <= mode.h)
+		if (800 <= mode.w and 600 <= mode.h)
 		{
 			const Resolution this_res = {mode.w, mode.h, fmt.BitsPerPixel};
 			if
@@ -653,7 +633,7 @@
 	opt.yres                = m_opt_section.get_int
 		("yres",                YRES);
 	opt.depth               = m_opt_section.get_int
-		("depth",                 16);
+		("depth",                 32);
 	opt.inputgrab           = m_opt_section.get_bool
 		("inputgrab",          false);
 	opt.fullscreen          = m_opt_section.get_bool

=== modified file 'src/wui/stock_menu.cc'
--- src/wui/stock_menu.cc	2013-02-10 19:36:24 +0000
+++ src/wui/stock_menu.cc	2013-07-21 15:08:25 +0000
@@ -37,7 +37,7 @@
 Stock_Menu::Stock_Menu
 	(Interactive_Player & plr, UI::UniqueWindow::Registry & registry)
 :
-UI::UniqueWindow(&plr, "stock_menu", &registry, 640, 480, _("Stock")),
+UI::UniqueWindow(&plr, "stock_menu", &registry, 480, 640, _("Stock")),
 m_player(plr)
 {
 	UI::Tab_Panel * tabs =

=== modified file 'src/wui/waresdisplay.h'
--- src/wui/waresdisplay.h	2013-07-21 14:36:52 +0000
+++ src/wui/waresdisplay.h	2013-07-21 15:08:25 +0000
@@ -52,7 +52,7 @@
 		 Widelands::WareWorker type,
 		 bool selectable,
 		 boost::function<void(Widelands::Ware_Index, bool)> callback_function = 0,
-		 bool horizontal = true);
+		 bool horizontal = false);
 
 	bool handle_mousemove
 		(uint8_t state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);

=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2013-01-21 18:50:52 +0000
+++ tribes/barbarians/conf	2013-07-21 15:08:25 +0000
@@ -10,7 +10,6 @@
 icon=pics/icon.png
 # Wares and workers positions in wares window. Columns are separated by ;,
 # Entries in the columns separated by ,
-# TODO: cloth is not in this list as it is currently not used
 wares_order= raw_stone,trunk, blackwood, grout, thatchreed, cloth; fish, meat, water, wheat, pittabread, beer, strongbeer, ration, snack, meal; coal, ironore, iron, goldstone, gold; pick, felling_axe, shovel, hammer, fishing_rod, hunting_spear, scythe, bakingtray, kitchen_tools, fire_tongs; axe, sharpaxe, broadaxe, bronzeaxe, battleaxe, warriorsaxe, helm , mask , warhelmet
 
 workers_order=carrier, ox, cattlebreeder; stonemason, lumberjack, ranger, builder, lime-burner, ferner, weaver, shipwright; fisher , hunter , gamekeeper, farmer, baker, brewer, master-brewer, innkeeper; geologist,miner, chief-miner, master-miner, burner, smelter; blacksmith, master-blacksmith; soldier, trainer, helmsmith, scout