From 7abad2b20ee239c96f702b2463c98aca4f58aacf Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 19 Aug 2006 10:00:30 +0000 Subject: (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: - New optional landscape generator (TerraGenesis Perlin) - Load heightmaps (either BMP or PNG) - Progress dialog while generating worlds (no longer a 'hanging' screen) - New dialogs for NewGame, Create Scenario and Play Heightmap - Easier to configure your landscape - More things to configure (tree-placer, ..) - Speedup of world generation - New console command 'restart': restart the map EXACTLY as it was when you first started it (needs a game made after or with this commit) - New console command 'getseed': get the seed of your map and share it with others (of course only works with generated maps) - Many new, world generation related, things - Many internal cleanups and rewrites Many tnx to those people who helped making this: Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic) Many tnx to those who helped testing: Arnau, Bjarni, and tokai (alfabetic) And to all other people who helped testing and sending comments / bugs Stats: 673 lines changed, 3534 new lines, 79 new strings --- clear_cmd.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'clear_cmd.c') diff --git a/clear_cmd.c b/clear_cmd.c index 6d1016daa..eab094d5d 100644 --- a/clear_cmd.c +++ b/clear_cmd.c @@ -15,6 +15,7 @@ #include "variables.h" #include "table/sprites.h" #include "unmovable_map.h" +#include "genworld.h" typedef struct TerraformerHeightMod { TileIndex tile; @@ -693,22 +694,28 @@ static void TileLoop_Clear(TileIndex tile) void GenerateClearTile(void) { - uint i; + uint i, gi; TileIndex tile; - /* add hills */ + /* add rough tiles */ i = ScaleByMapSize(GB(Random(), 0, 10) + 0x400); + gi = ScaleByMapSize(GB(Random(), 0, 7) + 0x80); + + SetGeneratingWorldProgress(GWP_ROUGH_ROCKY, gi + i); do { + IncreaseGeneratingWorldProgress(GWP_ROUGH_ROCKY); tile = RandomTile(); - if (IsTileType(tile, MP_CLEAR)) SetClearGroundDensity(tile, CLEAR_ROUGH, 3); + if (IsTileType(tile, MP_CLEAR) && !IsClearGround(tile, CLEAR_DESERT)) SetClearGroundDensity(tile, CLEAR_ROUGH, 3); } while (--i); - /* add grey squares */ - i = ScaleByMapSize(GB(Random(), 0, 7) + 0x80); + /* add rocky tiles */ + i = gi; do { uint32 r = Random(); tile = RandomTileSeed(r); - if (IsTileType(tile, MP_CLEAR)) { + + IncreaseGeneratingWorldProgress(GWP_ROUGH_ROCKY); + if (IsTileType(tile, MP_CLEAR) && !IsClearGround(tile, CLEAR_DESERT)) { uint j = GB(r, 16, 4) + 5; for (;;) { TileIndex tile_new; @@ -717,7 +724,7 @@ void GenerateClearTile(void) do { if (--j == 0) goto get_out; tile_new = tile + TileOffsByDir(GB(Random(), 0, 2)); - } while (!IsTileType(tile_new, MP_CLEAR)); + } while (!IsTileType(tile_new, MP_CLEAR) || IsClearGround(tile_new, CLEAR_DESERT)); tile = tile_new; } get_out:; -- cgit v1.2.3-54-g00ecf