Mercurial > hg > openttd

changeset 17817:96d8e7be4116 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22608) -Fix[FS#4663]: Use rotated heightmap sizes for reporting scaling problems.
author alberth <alberth@openttd.org>
date Sun, 26 Jun 2011 16:16:04 +0000
parents ca3e9e3d4052
children 1ce56419030d
files src/genworld_gui.cpp
diffstat 1 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -602,12 +602,22 @@
 				this->SetDirty();
 				break;
 
-			case GLAND_GENERATE_BUTTON: // Generate
+			case GLAND_GENERATE_BUTTON: { // Generate
+				/* Get rotated map size. */
+				uint map_x;
+				uint map_y;
+				if (_settings_newgame.game_creation.heightmap_rotation == HM_CLOCKWISE) {
+					map_x = this->y;
+					map_y = this->x;
+				} else {
+					map_x = this->x;
+					map_y = this->y;
+				}
 				if (mode == GLWM_HEIGHTMAP &&
-						(this->x * 2 < (1U << _settings_newgame.game_creation.map_x) ||
-						this->x / 2 > (1U << _settings_newgame.game_creation.map_x) ||
-						this->y * 2 < (1U << _settings_newgame.game_creation.map_y) ||
-						this->y / 2 > (1U << _settings_newgame.game_creation.map_y))) {
+						(map_x * 2 < (1U << _settings_newgame.game_creation.map_x) ||
+						map_x / 2 > (1U << _settings_newgame.game_creation.map_x) ||
+						map_y * 2 < (1U << _settings_newgame.game_creation.map_y) ||
+						map_y / 2 > (1U << _settings_newgame.game_creation.map_y))) {
 					ShowQuery(
 						STR_WARNING_HEIGHTMAP_SCALE_CAPTION,
 						STR_WARNING_HEIGHTMAP_SCALE_MESSAGE,
@@ -617,6 +627,7 @@
 					StartGeneratingLandscape(mode);
 				}
 				break;
+			}
 
 			case GLAND_START_DATE_DOWN:
 			case GLAND_START_DATE_UP: // Year buttons