mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22608) -Fix[FS#4663]: Use rotated heightmap sizes for reporting scaling problems.

release/1.2
alberth 2011-06-26 16:16:04 +00:00
parent c74fd63af3
commit a0cd04130a
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/genworld_gui.cpp
View File

@ -602,12 +602,22 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
this->SetDirty(); this->SetDirty();
break; 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 && if (mode == GLWM_HEIGHTMAP &&
(this->x * 2 < (1U << _settings_newgame.game_creation.map_x) || (map_x * 2 < (1U << _settings_newgame.game_creation.map_x) ||
this->x / 2 > (1U << _settings_newgame.game_creation.map_x) || map_x / 2 > (1U << _settings_newgame.game_creation.map_x) ||
this->y * 2 < (1U << _settings_newgame.game_creation.map_y) || map_y * 2 < (1U << _settings_newgame.game_creation.map_y) ||
this->y / 2 > (1U << _settings_newgame.game_creation.map_y))) { map_y / 2 > (1U << _settings_newgame.game_creation.map_y))) {
ShowQuery( ShowQuery(
STR_WARNING_HEIGHTMAP_SCALE_CAPTION, STR_WARNING_HEIGHTMAP_SCALE_CAPTION,
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE, STR_WARNING_HEIGHTMAP_SCALE_MESSAGE,
@ -617,6 +627,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
StartGeneratingLandscape(mode); StartGeneratingLandscape(mode);
} }
break; break;
}
case GLAND_START_DATE_DOWN: case GLAND_START_DATE_DOWN:
case GLAND_START_DATE_UP: // Year buttons case GLAND_START_DATE_UP: // Year buttons