From 4574858f0a764169cccd2ea41ba2a231f89ef42c Mon Sep 17 00:00:00 2001 From: belugas Date: Tue, 10 Feb 2009 00:50:04 +0000 Subject: (svn r15437) -Codechange: Do not run a code section when you already know it is useless -Codechange: Do not rely on a decision based on something that has already been evaluated --- src/unmovable_cmd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp index 6e86db8ff..4b7eea254 100644 --- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -391,7 +391,7 @@ void GenerateUnmovables() int lighthouses_to_build = _settings_game.game_creation.landscape == LT_TROPIC ? 0 : ScaleByMapSize1D((Random() & 3) + 7); /* Scale the amount of lighthouses with the amount of land at the borders. */ - if (_settings_game.construction.freeform_edges) { + if (_settings_game.construction.freeform_edges && lighthouses_to_build != 0) { uint num_water_tiles = 0; for (uint x = 0; x < MapMaxX(); x++) { if (IsTileType(TileXY(x, 1), MP_WATER)) num_water_tiles++; @@ -421,8 +421,6 @@ void GenerateUnmovables() } } - if (_settings_game.game_creation.landscape == LT_TROPIC) return; - /* add lighthouses */ uint maxx = MapMaxX(); uint maxy = MapMaxY(); -- cgit v1.2.3-70-g09d2