diff options
| author | tron <tron@openttd.org> | 2006-02-01 15:31:21 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-02-01 15:31:21 +0000 |
| commit | ac4f4e30d59aa3661128d51e2a34b7d0a4958de8 (patch) | |
| tree | 4e04e1c3dec5248c24a59e01843c70d577ff6f1a /landscape.c | |
| parent | 2b9850969279c76e1739c432854121b0e6d4070f (diff) | |
| download | openttd-ac4f4e30d59aa3661128d51e2a34b7d0a4958de8.tar.xz | |
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
See clear.h for details
Diffstat (limited to 'landscape.c')
| -rw-r--r-- | landscape.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/landscape.c b/landscape.c index 13b89d3ef..4cffefe65 100644 --- a/landscape.c +++ b/landscape.c @@ -2,6 +2,7 @@ #include "stdafx.h" #include "openttd.h" +#include "clear.h" #include "functions.h" #include "map.h" #include "player.h" @@ -237,12 +238,13 @@ void DrawFoundation(TileInfo *ti, uint f) void DoClearSquare(TileIndex tile) { - ModifyTile(tile, - MP_SETTYPE(MP_CLEAR) | - MP_MAP2_CLEAR | MP_MAP3LO_CLEAR | MP_MAP3HI_CLEAR | MP_MAPOWNER | MP_MAP5, - OWNER_NONE, /* map_owner */ - _generating_world ? 3 : 0 /* map5 */ - ); + SetTileType(tile, MP_CLEAR); + SetTileOwner(tile, OWNER_NONE); + _m[tile].m2 = 0; + _m[tile].m3 = 0; + _m[tile].m4 = 0; + SetClearGroundDensity(tile, CL_GRASS, _generating_world ? 3 : 0); + MarkTileDirtyByTile(tile); } uint32 GetTileTrackStatus(TileIndex tile, TransportType mode) @@ -615,7 +617,7 @@ static void CreateDesertOrRainForest(void) for (data = _make_desert_or_rainforest_data; data != endof(_make_desert_or_rainforest_data); ++data) { TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data)); - if (IsTileType(t, MP_CLEAR) && (_m[t].m5 & 0x1c) == 0x14) break; + if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CL_DESERT)) break; } if (data == endof(_make_desert_or_rainforest_data)) SetMapExtraBits(tile, 2); |