(svn r17271) -Fix: SetFill sometimes used 1/0 when it should be using true/false

1 files changed, 24 insertions, 24 deletions

diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 805491710..6e386cf86 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -250,9 +250,9 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_NUM_2, STR_NULL),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
-				NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0),
+				NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(true, false),
 				NWidget(NWID_HORIZONTAL),
 					/* Number of towns. */
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(0x0, STR_NULL),
@@ -263,9 +263,9 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
-				NWidget(NWID_SPACER), SetMinimalSize(0, 6), SetFill(1, 0),
+				NWidget(NWID_SPACER), SetMinimalSize(0, 6), SetFill(true, false),
 				NWidget(NWID_HORIZONTAL),
 					/* Number of industries. */
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(0x0, STR_NULL),
@@ -277,15 +277,15 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_NUM_3, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
-				NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0),
+				NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(true, false),
 				NWidget(NWID_HORIZONTAL),
 					/* Edit box for seed. */
 					NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP),
 					NWidget(NWID_SPACER), SetMinimalSize(8, 0),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(NWID_VERTICAL),
@@ -306,11 +306,11 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 					NWidget(NWID_VERTICAL),
 						NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84,30),
 														SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetPadding(64, 0, 0, 11),
-						NWidget(NWID_SPACER), SetFill(0, 1),
+						NWidget(NWID_SPACER), SetFill(false, true),
 					EndContainer(),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
-				NWidget(NWID_SPACER), SetFill(1, 1),
+				NWidget(NWID_SPACER), SetFill(true, true),
 			EndContainer(),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 4),
@@ -334,7 +334,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_MAPGEN_NORTHEAST, STR_NULL), SetPadding(2, 0, 0, 4),
 				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_MAPGEN_SOUTHEAST, STR_NULL), SetPadding(1, 0, 0, 4),
 			EndContainer(),
-			NWidget(NWID_SPACER), SetFill(1, 0),
+			NWidget(NWID_SPACER), SetFill(true, false),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 9),
 	EndContainer(),
@@ -412,7 +412,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 			NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TROPICAL), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
 			NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TOYLAND), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
 		EndContainer(),
-		NWidget(NWID_SPACER), SetMinimalSize(0, 33), SetFill(0,1),
+		NWidget(NWID_SPACER), SetMinimalSize(0, 33), SetFill(false, true),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(12, 0),
 			/* Labels at the left side. */
@@ -430,7 +430,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
 				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
-				NWidget(NWID_SPACER), SetFill(0, 1),
+				NWidget(NWID_SPACER), SetFill(false, true),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 			/* Widgets at the right of the labels. */
@@ -442,7 +442,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_NUM_2, STR_NULL),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 				NWidget(NWID_HORIZONTAL),
@@ -455,7 +455,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 				NWidget(NWID_HORIZONTAL),
@@ -469,7 +469,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_NUM_3, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 				NWidget(NWID_HORIZONTAL),
@@ -477,7 +477,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP),
 					NWidget(NWID_SPACER), SetMinimalSize(8, 0),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 				NWidget(NWID_HORIZONTAL),
@@ -491,11 +491,11 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(NWID_SPACER), SetMinimalSize(11, 0),
 					/* Generate button. */
 					NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84, 30), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
-				NWidget(NWID_SPACER), SetFill(0, 1),
+				NWidget(NWID_SPACER), SetFill(false, true),
 			EndContainer(),
-			NWidget(NWID_SPACER), SetFill(1, 0),
+			NWidget(NWID_SPACER), SetFill(true, false),
 		EndContainer(),
 	EndContainer(),
 };
@@ -1177,7 +1177,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = {
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_MAPSIZE_X_TEXT), SetMinimalSize(78, 11),
 												SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL), SetPadding(1, 0, 0, 0),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, CSCEN_MAPSIZE_X_PULLDOWN), SetMinimalSize(48, 12),
 												SetDataTip(STR_NUM_1, STR_NULL), SetPadding(0, 4, 0, 0),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11),
@@ -1189,7 +1189,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = {
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_START_DATE_LABEL), SetMinimalSize(78, 11),
 												SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CSCEN_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
@@ -1198,12 +1198,12 @@ static const NWidgetPart _nested_create_scenario_widgets[] = {
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_LABEL), SetMinimalSize(144, 11),
 												SetDataTip(STR_SE_MAPGEN_FLAT_WORLD_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
-					NWidget(NWID_SPACER), SetFill(1, 0),
+					NWidget(NWID_SPACER), SetFill(true, false),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_NUM_3, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP),
 				EndContainer(),
-				NWidget(NWID_SPACER), SetFill(1, 1),
+				NWidget(NWID_SPACER), SetFill(true, true),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),