(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
This commit is contained in:
belugas 2009-02-10 00:50:04 +00:00
parent ad30a3c4ca
commit da9783aaf7
1 changed files with 1 additions and 3 deletions

View File

@ -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();