(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
-Fix: use a flag instead of TL_NO_ROADS to forbid towns to build roads. The flag is ignored during world generation, so there won't be 'ghost' towns anymore -Feature: town layout is now stored per town, so it is possible to (manually) set different layout for each town
This commit is contained in:
@@ -443,13 +443,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
|
||||
case GLAND_GENERATE_BUTTON: // Generate
|
||||
MakeNewgameSettingsLive();
|
||||
|
||||
if (_settings_game.economy.town_layout == TL_NO_ROADS) {
|
||||
ShowQuery(
|
||||
STR_TOWN_LAYOUT_WARNING_CAPTION,
|
||||
STR_TOWN_LAYOUT_WARNING_MESSAGE,
|
||||
this,
|
||||
LandscapeGenerationCallback);
|
||||
} else if (mode == GLWP_HEIGHTMAP &&
|
||||
if (mode == GLWP_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) ||
|
||||
@@ -685,10 +679,6 @@ void ShowHeightmapLoad()
|
||||
|
||||
void StartScenarioEditor()
|
||||
{
|
||||
if (_settings_newgame.economy.town_layout == TL_NO_ROADS) {
|
||||
_settings_newgame.economy.town_layout = TL_ORIGINAL;
|
||||
}
|
||||
|
||||
StartGeneratingLandscape(GLWP_SCENARIO);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user