mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4279) s/\<CL_/CLEAR_/

release/0.5
tron 2006-04-04 21:35:13 +00:00
parent 52892863e5
commit 99a6b9b8f2
7 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clear_cmd.c
View File

@ -409,7 +409,7 @@ static int32 ClearTile_Clear(TileIndex tile, byte flags)
}; };
int32 price; int32 price;
if (IsClearGround(tile, CL_GRASS) && GetClearDensity(tile) == 0) { if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) {
price = 0; price = 0;
} else { } else {
price = *clear_price_table[GetClearGround(tile)]; price = *clear_price_table[GetClearGround(tile)];
@ -485,27 +485,27 @@ void DrawClearLandFence(const TileInfo *ti)
static void DrawTile_Clear(TileInfo *ti) static void DrawTile_Clear(TileInfo *ti)
{ {
switch (GetClearGround(ti->tile)) { switch (GetClearGround(ti->tile)) {
case CL_GRASS: case CLEAR_GRASS:
DrawClearLandTile(ti, GetClearDensity(ti->tile)); DrawClearLandTile(ti, GetClearDensity(ti->tile));
break; break;
case CL_ROUGH: case CLEAR_ROUGH:
DrawHillyLandTile(ti); DrawHillyLandTile(ti);
break; break;
case CL_ROCKS: case CLEAR_ROCKS:
DrawGroundSprite(SPR_FLAT_ROCKY_LAND_1 + _tileh_to_sprite[ti->tileh]); DrawGroundSprite(SPR_FLAT_ROCKY_LAND_1 + _tileh_to_sprite[ti->tileh]);
break; break;
case CL_FIELDS: case CLEAR_FIELDS:
DrawGroundSprite(_clear_land_sprites_1[GetFieldType(ti->tile)] + _tileh_to_sprite[ti->tileh]); DrawGroundSprite(_clear_land_sprites_1[GetFieldType(ti->tile)] + _tileh_to_sprite[ti->tileh]);
break; break;
case CL_SNOW: case CLEAR_SNOW:
DrawGroundSprite(_clear_land_sprites_2[GetClearDensity(ti->tile)] + _tileh_to_sprite[ti->tileh]); DrawGroundSprite(_clear_land_sprites_2[GetClearDensity(ti->tile)] + _tileh_to_sprite[ti->tileh]);
break; break;
case CL_DESERT: case CLEAR_DESERT:
DrawGroundSprite(_clear_land_sprites_3[GetClearDensity(ti->tile)] + _tileh_to_sprite[ti->tileh]); DrawGroundSprite(_clear_land_sprites_3[GetClearDensity(ti->tile)] + _tileh_to_sprite[ti->tileh]);
break; break;
} }
@ -539,9 +539,9 @@ void TileLoopClearHelper(TileIndex tile)
byte neighbour; byte neighbour;
TileIndex dirty = INVALID_TILE; TileIndex dirty = INVALID_TILE;
self = (IsTileType(tile, MP_CLEAR) && IsClearGround(tile, CL_FIELDS)); self = (IsTileType(tile, MP_CLEAR) && IsClearGround(tile, CLEAR_FIELDS));
neighbour = (IsTileType(TILE_ADDXY(tile, 1, 0), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 1, 0), CL_FIELDS)); neighbour = (IsTileType(TILE_ADDXY(tile, 1, 0), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 1, 0), CLEAR_FIELDS));
if (GetFenceSW(tile) == 0) { if (GetFenceSW(tile) == 0) {
if (self != neighbour) { if (self != neighbour) {
SetFenceSW(tile, 3); SetFenceSW(tile, 3);
@ -554,7 +554,7 @@ void TileLoopClearHelper(TileIndex tile)
} }
} }
neighbour = (IsTileType(TILE_ADDXY(tile, 0, 1), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 0, 1), CL_FIELDS)); neighbour = (IsTileType(TILE_ADDXY(tile, 0, 1), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 0, 1), CLEAR_FIELDS));
if (GetFenceSE(tile) == 0) { if (GetFenceSE(tile) == 0) {
if (self != neighbour) { if (self != neighbour) {
SetFenceSE(tile, 3); SetFenceSE(tile, 3);
@ -578,11 +578,11 @@ static void TileLoopClearAlps(TileIndex tile)
int k = GetTileZ(tile) - _opt.snow_line; int k = GetTileZ(tile) - _opt.snow_line;
if (k < -TILE_HEIGHT) { // well below the snow line if (k < -TILE_HEIGHT) { // well below the snow line
if (!IsClearGround(tile, CL_SNOW)) return; if (!IsClearGround(tile, CLEAR_SNOW)) return;
if (GetClearDensity(tile) == 0) SetClearGroundDensity(tile, CL_GRASS, 3); if (GetClearDensity(tile) == 0) SetClearGroundDensity(tile, CLEAR_GRASS, 3);
} else { } else {
if (!IsClearGround(tile, CL_SNOW)) { if (!IsClearGround(tile, CLEAR_SNOW)) {
SetClearGroundDensity(tile, CL_SNOW, 0); SetClearGroundDensity(tile, CLEAR_SNOW, 0);
} else { } else {
uint density = min((uint)(k + TILE_HEIGHT) / TILE_HEIGHT, 3); uint density = min((uint)(k + TILE_HEIGHT) / TILE_HEIGHT, 3);
@ -601,17 +601,17 @@ static void TileLoopClearAlps(TileIndex tile)
static void TileLoopClearDesert(TileIndex tile) static void TileLoopClearDesert(TileIndex tile)
{ {
if (IsClearGround(tile, CL_DESERT)) return; if (IsClearGround(tile, CLEAR_DESERT)) return;
if (GetTropicZone(tile) == TROPICZONE_DESERT) { if (GetTropicZone(tile) == TROPICZONE_DESERT) {
SetClearGroundDensity(tile, CL_DESERT, 3); SetClearGroundDensity(tile, CLEAR_DESERT, 3);
} else { } else {
if (GetTropicZone(tile + TileDiffXY( 1, 0)) != TROPICZONE_DESERT && if (GetTropicZone(tile + TileDiffXY( 1, 0)) != TROPICZONE_DESERT &&
GetTropicZone(tile + TileDiffXY(-1, 0)) != TROPICZONE_DESERT && GetTropicZone(tile + TileDiffXY(-1, 0)) != TROPICZONE_DESERT &&
GetTropicZone(tile + TileDiffXY( 0, 1)) != TROPICZONE_DESERT && GetTropicZone(tile + TileDiffXY( 0, 1)) != TROPICZONE_DESERT &&
GetTropicZone(tile + TileDiffXY( 0, -1)) != TROPICZONE_DESERT) GetTropicZone(tile + TileDiffXY( 0, -1)) != TROPICZONE_DESERT)
return; return;
SetClearGroundDensity(tile, CL_DESERT, 1); SetClearGroundDensity(tile, CLEAR_DESERT, 1);
} }
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
@ -627,7 +627,7 @@ static void TileLoop_Clear(TileIndex tile)
} }
switch (GetClearGround(tile)) { switch (GetClearGround(tile)) {
case CL_GRASS: case CLEAR_GRASS:
if (GetClearDensity(tile) == 3) return; if (GetClearDensity(tile) == 3) return;
if (_game_mode != GM_EDITOR) { if (_game_mode != GM_EDITOR) {
@ -639,11 +639,11 @@ static void TileLoop_Clear(TileIndex tile)
AddClearDensity(tile, 1); AddClearDensity(tile, 1);
} }
} else { } else {
SetClearGroundDensity(tile, GB(Random(), 0, 8) > 21 ? CL_GRASS : CL_ROUGH, 3); SetClearGroundDensity(tile, GB(Random(), 0, 8) > 21 ? CLEAR_GRASS : CLEAR_ROUGH, 3);
} }
break; break;
case CL_FIELDS: { case CLEAR_FIELDS: {
uint field_type; uint field_type;
if (_game_mode == GM_EDITOR) return; if (_game_mode == GM_EDITOR) return;
@ -677,7 +677,7 @@ void GenerateClearTile(void)
i = ScaleByMapSize(GB(Random(), 0, 10) + 0x400); i = ScaleByMapSize(GB(Random(), 0, 10) + 0x400);
do { do {
tile = RandomTile(); tile = RandomTile();
if (IsTileType(tile, MP_CLEAR)) SetClearGroundDensity(tile, CL_ROUGH, 3); if (IsTileType(tile, MP_CLEAR)) SetClearGroundDensity(tile, CLEAR_ROUGH, 3);
} while (--i); } while (--i);
/* add grey squares */ /* add grey squares */
@ -690,7 +690,7 @@ void GenerateClearTile(void)
for (;;) { for (;;) {
TileIndex tile_new; TileIndex tile_new;
SetClearGroundDensity(tile, CL_ROCKS, 3); SetClearGroundDensity(tile, CLEAR_ROCKS, 3);
do { do {
if (--j == 0) goto get_out; if (--j == 0) goto get_out;
tile_new = tile + TileOffsByDir(GB(Random(), 0, 2)); tile_new = tile + TileOffsByDir(GB(Random(), 0, 2));
@ -723,7 +723,7 @@ static const StringID _clear_land_str[] = {
static void GetTileDesc_Clear(TileIndex tile, TileDesc *td) static void GetTileDesc_Clear(TileIndex tile, TileDesc *td)
{ {
if (IsClearGround(tile, CL_GRASS) && GetClearDensity(tile) == 0) { if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) {
td->str = STR_080C_BARE_LAND; td->str = STR_080C_BARE_LAND;
} else { } else {
td->str = _clear_land_str[GetClearGround(tile)]; td->str = _clear_land_str[GetClearGround(tile)];

18
clear_map.h
View File

@ -10,12 +10,12 @@
* valid densities (bits 0...1) in comments after the enum * valid densities (bits 0...1) in comments after the enum
*/ */
typedef enum ClearGround { typedef enum ClearGround {
CL_GRASS = 0, // 0-3 CLEAR_GRASS = 0, // 0-3
CL_ROUGH = 1, // 3 CLEAR_ROUGH = 1, // 3
CL_ROCKS = 2, // 3 CLEAR_ROCKS = 2, // 3
CL_FIELDS = 3, // 3 CLEAR_FIELDS = 3, // 3
CL_SNOW = 4, // 0-3 CLEAR_SNOW = 4, // 0-3
CL_DESERT = 5 // 1,3 CLEAR_DESERT = 5 // 1,3
} ClearGround; } ClearGround;
@ -73,13 +73,13 @@ static inline void SetClearGroundDensity(TileIndex t, ClearGround type, uint den
static inline uint GetFieldType(TileIndex t) static inline uint GetFieldType(TileIndex t)
{ {
assert(GetClearGround(t) == CL_FIELDS); assert(GetClearGround(t) == CLEAR_FIELDS);
return GB(_m[t].m3, 0, 4); return GB(_m[t].m3, 0, 4);
} }
static inline void SetFieldType(TileIndex t, uint f) static inline void SetFieldType(TileIndex t, uint f)
{ {
assert(GetClearGround(t) == CL_FIELDS); // XXX incomplete assert(GetClearGround(t) == CLEAR_FIELDS); // XXX incomplete
SB(_m[t].m3, 0, 4, f); SB(_m[t].m3, 0, 4, f);
} }
@ -128,7 +128,7 @@ static inline void MakeField(TileIndex t, uint field_type)
_m[t].m2 = 0; _m[t].m2 = 0;
_m[t].m3 = field_type; _m[t].m3 = field_type;
_m[t].m4 = 0 << 5 | 0 << 2; _m[t].m4 = 0 << 5 | 0 << 2;
SetClearGroundDensity(t, CL_FIELDS, 3); SetClearGroundDensity(t, CLEAR_FIELDS, 3);
} }
#endif #endif

4
industry_cmd.c
View File

@ -895,7 +895,7 @@ static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5,
static bool IsBadFarmFieldTile(TileIndex tile) static bool IsBadFarmFieldTile(TileIndex tile)
{ {
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_CLEAR: return IsClearGround(tile, CL_FIELDS) || IsClearGround(tile, CL_SNOW); case MP_CLEAR: return IsClearGround(tile, CLEAR_FIELDS) || IsClearGround(tile, CLEAR_SNOW);
case MP_TREES: return false; case MP_TREES: return false;
default: return true; default: return true;
} }
@ -904,7 +904,7 @@ static bool IsBadFarmFieldTile(TileIndex tile)
static bool IsBadFarmFieldTile2(TileIndex tile) static bool IsBadFarmFieldTile2(TileIndex tile)
{ {
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_CLEAR: return IsClearGround(tile, CL_SNOW); case MP_CLEAR: return IsClearGround(tile, CLEAR_SNOW);
case MP_TREES: return false; case MP_TREES: return false;
default: return true; default: return true;
} }

6
landscape.c
View File

@ -231,7 +231,7 @@ void DrawFoundation(TileInfo *ti, uint f)
void DoClearSquare(TileIndex tile) void DoClearSquare(TileIndex tile)
{ {
MakeClear(tile, CL_GRASS, _generating_world ? 3 : 0); MakeClear(tile, CLEAR_GRASS, _generating_world ? 3 : 0);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
@ -380,7 +380,7 @@ void InitializeLandscape(void)
for (y = 0; y < maxy; y++) { for (y = 0; y < maxy; y++) {
for (x = 0; x < maxx; x++) { for (x = 0; x < maxx; x++) {
MakeClear(sizex * y + x, CL_GRASS, 3); MakeClear(sizex * y + x, CLEAR_GRASS, 3);
SetTileHeight(sizex * y + x, 0); SetTileHeight(sizex * y + x, 0);
} }
MakeVoid(sizex * y + x); MakeVoid(sizex * y + x);
@ -550,7 +550,7 @@ static void CreateDesertOrRainForest(void)
for (data = _make_desert_or_rainforest_data; for (data = _make_desert_or_rainforest_data;
data != endof(_make_desert_or_rainforest_data); ++data) { data != endof(_make_desert_or_rainforest_data); ++data) {
TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data)); TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CL_DESERT)) break; if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break;
} }
if (data == endof(_make_desert_or_rainforest_data)) if (data == endof(_make_desert_or_rainforest_data))
SetTropicZone(tile, TROPICZONE_RAINFOREST); SetTropicZone(tile, TROPICZONE_RAINFOREST);

2
smallmap_gui.c
View File

@ -482,7 +482,7 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile)
switch (t) { switch (t) {
case MP_CLEAR: case MP_CLEAR:
if (IsClearGround(tile, CL_GRASS) && GetClearDensity(tile) < 3) { if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) {
bits = MKCOLOR(0x37373737); bits = MKCOLOR(0x37373737);
} else { } else {
bits = _vegetation_clear_bits[GetClearGround(tile)]; bits = _vegetation_clear_bits[GetClearGround(tile)];

2
terraform_gui.c
View File

@ -82,7 +82,7 @@ static void GenerateRockyArea(TileIndex end, TileIndex start)
BEGIN_TILE_LOOP(tile, size_x, size_y, TileXY(sx, sy)) { BEGIN_TILE_LOOP(tile, size_x, size_y, TileXY(sx, sy)) {
if (IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) { if (IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) {
MakeClear(tile, CL_ROCKS, 3); MakeClear(tile, CLEAR_ROCKS, 3);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
success = true; success = true;
} }

40
tree_cmd.c
View File

@ -68,8 +68,8 @@ static void DoPlaceMoreTrees(TileIndex tile)
if (dist <= 13 && if (dist <= 13 &&
IsTileType(cur_tile, MP_CLEAR) && IsTileType(cur_tile, MP_CLEAR) &&
!IsClearGround(cur_tile, CL_FIELDS) && !IsClearGround(cur_tile, CLEAR_FIELDS) &&
!IsClearGround(cur_tile, CL_ROCKS)) { !IsClearGround(cur_tile, CLEAR_ROCKS)) {
PlaceTree(cur_tile, r); PlaceTree(cur_tile, r);
} }
} }
@ -92,8 +92,8 @@ void PlaceTreesRandomly(void)
uint32 r = Random(); uint32 r = Random();
TileIndex tile = RandomTileSeed(r); TileIndex tile = RandomTileSeed(r);
if (IsTileType(tile, MP_CLEAR) && if (IsTileType(tile, MP_CLEAR) &&
!IsClearGround(tile, CL_FIELDS) && !IsClearGround(tile, CLEAR_FIELDS) &&
!IsClearGround(tile, CL_ROCKS)) { !IsClearGround(tile, CLEAR_ROCKS)) {
PlaceTree(tile, r); PlaceTree(tile, r);
} }
} while (--i); } while (--i);
@ -179,8 +179,8 @@ int32 CmdPlantTree(int ex, int ey, uint32 flags, uint32 p1, uint32 p2)
} }
switch (GetClearGround(tile)) { switch (GetClearGround(tile)) {
case CL_FIELDS: cost += _price.clear_3; break; case CLEAR_FIELDS: cost += _price.clear_3; break;
case CL_ROCKS: cost += _price.clear_2; break; case CLEAR_ROCKS: cost += _price.clear_2; break;
default: break; default: break;
} }
@ -202,9 +202,9 @@ int32 CmdPlantTree(int ex, int ey, uint32 flags, uint32 p1, uint32 p2)
growth = _game_mode == GM_EDITOR ? 3 : 0; growth = _game_mode == GM_EDITOR ? 3 : 0;
switch (GetClearGround(tile)) { switch (GetClearGround(tile)) {
case CL_ROUGH: MakeTree(tile, treetype, 0, growth, TREE_GROUND_ROUGH, 0); break; case CLEAR_ROUGH: MakeTree(tile, treetype, 0, growth, TREE_GROUND_ROUGH, 0); break;
case CL_SNOW: MakeTree(tile, treetype, 0, growth, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break; case CLEAR_SNOW: MakeTree(tile, treetype, 0, growth, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break;
default: MakeTree(tile, treetype, 0, growth, TREE_GROUND_GRASS, 0); break; default: MakeTree(tile, treetype, 0, growth, TREE_GROUND_GRASS, 0); break;
} }
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
@ -482,13 +482,13 @@ static void TileLoop_Trees(TileIndex tile)
if (!IsTileType(tile, MP_CLEAR)) return; if (!IsTileType(tile, MP_CLEAR)) return;
switch (GetClearGround(tile)) { switch (GetClearGround(tile)) {
case CL_GRASS: case CLEAR_GRASS:
if (GetClearDensity(tile) != 3) return; if (GetClearDensity(tile) != 3) return;
MakeTree(tile, treetype, 0, 0, TREE_GROUND_GRASS, 0); MakeTree(tile, treetype, 0, 0, TREE_GROUND_GRASS, 0);
break; break;
case CL_ROUGH: MakeTree(tile, treetype, 0, 0, TREE_GROUND_ROUGH, 0); break; case CLEAR_ROUGH: MakeTree(tile, treetype, 0, 0, TREE_GROUND_ROUGH, 0); break;
case CL_SNOW: MakeTree(tile, treetype, 0, 0, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break; case CLEAR_SNOW: MakeTree(tile, treetype, 0, 0, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break;
default: return; default: return;
} }
break; break;
@ -508,9 +508,9 @@ static void TileLoop_Trees(TileIndex tile)
} else { } else {
/* just one tree, change type into MP_CLEAR */ /* just one tree, change type into MP_CLEAR */
switch (GetTreeGround(tile)) { switch (GetTreeGround(tile)) {
case TREE_GROUND_GRASS: MakeClear(tile, CL_GRASS, 3); break; case TREE_GROUND_GRASS: MakeClear(tile, CLEAR_GRASS, 3); break;
case TREE_GROUND_ROUGH: MakeClear(tile, CL_ROUGH, 3); break; case TREE_GROUND_ROUGH: MakeClear(tile, CLEAR_ROUGH, 3); break;
default: MakeClear(tile, CL_SNOW, GetTreeDensity(tile)); break; default: MakeClear(tile, CLEAR_SNOW, GetTreeDensity(tile)); break;
} }
} }
break; break;
@ -534,9 +534,9 @@ void OnTick_Trees(void)
if (_opt.landscape == LT_DESERT && if (_opt.landscape == LT_DESERT &&
(r = Random(), tile = RandomTileSeed(r), GetTropicZone(tile) == TROPICZONE_RAINFOREST) && (r = Random(), tile = RandomTileSeed(r), GetTropicZone(tile) == TROPICZONE_RAINFOREST) &&
IsTileType(tile, MP_CLEAR) && IsTileType(tile, MP_CLEAR) &&
(ct = GetClearGround(tile), ct == CL_GRASS || ct == CL_ROUGH) && (ct = GetClearGround(tile), ct == CLEAR_GRASS || ct == CLEAR_ROUGH) &&
(tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) { (tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
MakeTree(tile, tree, 0, 0, ct == CL_ROUGH ? TREE_GROUND_ROUGH : TREE_GROUND_GRASS, 0); MakeTree(tile, tree, 0, 0, ct == CLEAR_ROUGH ? TREE_GROUND_ROUGH : TREE_GROUND_GRASS, 0);
} }
// byte underflow // byte underflow
@ -546,11 +546,11 @@ void OnTick_Trees(void)
r = Random(); r = Random();
tile = TILE_MASK(r); tile = TILE_MASK(r);
if (IsTileType(tile, MP_CLEAR) && if (IsTileType(tile, MP_CLEAR) &&
(ct = GetClearGround(tile), ct == CL_GRASS || ct == CL_ROUGH || ct == CL_SNOW) && (ct = GetClearGround(tile), ct == CLEAR_GRASS || ct == CLEAR_ROUGH || ct == CLEAR_SNOW) &&
(tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) { (tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
switch (ct) { switch (ct) {
case CL_GRASS: MakeTree(tile, tree, 0, 0, TREE_GROUND_GRASS, 0); break; case CLEAR_GRASS: MakeTree(tile, tree, 0, 0, TREE_GROUND_GRASS, 0); break;
case CL_ROUGH: MakeTree(tile, tree, 0, 0, TREE_GROUND_ROUGH, 0); break; case CLEAR_ROUGH: MakeTree(tile, tree, 0, 0, TREE_GROUND_ROUGH, 0); break;
default: MakeTree(tile, tree, 0, 0, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break; default: MakeTree(tile, tree, 0, 0, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break;
} }
} }