diff options
| author | rubidium <rubidium@openttd.org> | 2010-08-08 10:59:30 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-08-08 10:59:30 +0000 |
| commit | 3da3d131c6a1e17db81d08c161b944c2c00533da (patch) | |
| tree | 1793f2ebfc20fc2be1e028ad2252f8140f45334a /src/genworld.cpp | |
| parent | abc14d8fbfb9ca313d6a5ab50fc726a2507de6a4 (diff) | |
| download | openttd-3da3d131c6a1e17db81d08c161b944c2c00533da.tar.xz | |
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
Diffstat (limited to 'src/genworld.cpp')
| -rw-r--r-- | src/genworld.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp index 9f5d0842f..36604bf54 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -39,7 +39,7 @@ void GenerateClearTile(); void GenerateIndustries(); -void GenerateUnmovables(); +void GenerateObjects(); void GenerateTrees(); void StartupEconomy(); @@ -118,7 +118,7 @@ static void _GenerateWorld(void *) /* Don't generate landscape items when in the scenario editor. */ if (_gw.mode == GWM_EMPTY) { - SetGeneratingWorldProgress(GWP_UNMOVABLE, 1); + SetGeneratingWorldProgress(GWP_OBJECT, 1); /* Make sure the tiles at the north border are void tiles if needed. */ if (_settings_game.construction.freeform_edges) { @@ -130,7 +130,7 @@ static void _GenerateWorld(void *) if (_game_mode != GM_MENU) FlatEmptyWorld(_settings_game.game_creation.se_flat_world_height); ConvertGroundTilesIntoWaterTiles(); - IncreaseGeneratingWorldProgress(GWP_UNMOVABLE); + IncreaseGeneratingWorldProgress(GWP_OBJECT); } else { GenerateLandscape(_gw.mode); GenerateClearTile(); @@ -143,7 +143,7 @@ static void _GenerateWorld(void *) return; } GenerateIndustries(); - GenerateUnmovables(); + GenerateObjects(); GenerateTrees(); } } |