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

(svn r8953) -Codechange: make the names of enums of WaterTileType consistent with respect to RailTileType and RoadTileType.

release/0.6
rubidium 2007-03-01 13:27:51 +00:00
parent 7fd21fb29b
commit ef9b0bdd88
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/water_cmd.cpp
View File

@ -277,7 +277,7 @@ int32 CmdBuildCanal(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
static int32 ClearTile_Water(TileIndex tile, byte flags) static int32 ClearTile_Water(TileIndex tile, byte flags)
{ {
switch (GetWaterTileType(tile)) { switch (GetWaterTileType(tile)) {
case WATER_CLEAR: case WATER_TILE_CLEAR:
if (flags & DC_NO_WATER) return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER); if (flags & DC_NO_WATER) return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER);
// Make sure no vehicle is on the tile // Make sure no vehicle is on the tile
@ -294,7 +294,7 @@ static int32 ClearTile_Water(TileIndex tile, byte flags)
if (flags & DC_EXEC) DoClearSquare(tile); if (flags & DC_EXEC) DoClearSquare(tile);
return _price.clear_water; return _price.clear_water;
case WATER_COAST: { case WATER_TILE_COAST: {
Slope slope = GetTileSlope(tile, NULL); Slope slope = GetTileSlope(tile, NULL);
// Make sure no vehicle is on the tile // Make sure no vehicle is on the tile
@ -314,7 +314,7 @@ static int32 ClearTile_Water(TileIndex tile, byte flags)
} }
} }
case WATER_LOCK: { case WATER_TILE_LOCK: {
static const TileIndexDiffC _shiplift_tomiddle_offs[] = { static const TileIndexDiffC _shiplift_tomiddle_offs[] = {
{ 0, 0}, {0, 0}, { 0, 0}, {0, 0}, // middle { 0, 0}, {0, 0}, { 0, 0}, {0, 0}, // middle
{-1, 0}, {0, 1}, { 1, 0}, {0, -1}, // lower {-1, 0}, {0, 1}, { 1, 0}, {0, -1}, // lower
@ -327,7 +327,7 @@ static int32 ClearTile_Water(TileIndex tile, byte flags)
return RemoveShiplift(tile + ToTileIndexDiff(_shiplift_tomiddle_offs[GetSection(tile)]), flags); return RemoveShiplift(tile + ToTileIndexDiff(_shiplift_tomiddle_offs[GetSection(tile)]), flags);
} }
case WATER_DEPOT: case WATER_TILE_DEPOT:
if (flags & DC_AUTO) return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED); if (flags & DC_AUTO) return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED);
return RemoveShipDepot(tile, flags); return RemoveShipDepot(tile, flags);
@ -436,13 +436,13 @@ static void DrawWaterStuff(const TileInfo *ti, const WaterDrawTileStruct *wdts,
static void DrawTile_Water(TileInfo *ti) static void DrawTile_Water(TileInfo *ti)
{ {
switch (GetWaterTileType(ti->tile)) { switch (GetWaterTileType(ti->tile)) {
case WATER_CLEAR: case WATER_TILE_CLEAR:
DrawGroundSprite(SPR_FLAT_WATER_TILE, PAL_NONE); DrawGroundSprite(SPR_FLAT_WATER_TILE, PAL_NONE);
if (ti->z != 0 || !IsTileOwner(ti->tile, OWNER_WATER)) DrawCanalWater(ti->tile); if (ti->z != 0 || !IsTileOwner(ti->tile, OWNER_WATER)) DrawCanalWater(ti->tile);
DrawBridgeMiddle(ti); DrawBridgeMiddle(ti);
break; break;
case WATER_COAST: case WATER_TILE_COAST:
assert(!IsSteepSlope(ti->tileh)); assert(!IsSteepSlope(ti->tileh));
if (_coast_base != 0) { if (_coast_base != 0) {
DrawGroundSprite(_coast_base + ti->tileh, PAL_NONE); DrawGroundSprite(_coast_base + ti->tileh, PAL_NONE);
@ -452,12 +452,12 @@ static void DrawTile_Water(TileInfo *ti)
DrawBridgeMiddle(ti); DrawBridgeMiddle(ti);
break; break;
case WATER_LOCK: { case WATER_TILE_LOCK: {
const WaterDrawTileStruct *t = _shiplift_display_seq[GetSection(ti->tile)]; const WaterDrawTileStruct *t = _shiplift_display_seq[GetSection(ti->tile)];
DrawWaterStuff(ti, t, 0, ti->z > t[3].delta_y ? 24 : 0); DrawWaterStuff(ti, t, 0, ti->z > t[3].delta_y ? 24 : 0);
} break; } break;
case WATER_DEPOT: case WATER_TILE_DEPOT:
DrawWaterStuff(ti, _shipdepot_display_seq[GetSection(ti->tile)], PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)), 0); DrawWaterStuff(ti, _shipdepot_display_seq[GetSection(ti->tile)], PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)), 0);
break; break;
} }
@ -497,16 +497,16 @@ static void GetAcceptedCargo_Water(TileIndex tile, AcceptedCargo ac)
static void GetTileDesc_Water(TileIndex tile, TileDesc *td) static void GetTileDesc_Water(TileIndex tile, TileDesc *td)
{ {
switch (GetWaterTileType(tile)) { switch (GetWaterTileType(tile)) {
case WATER_CLEAR: case WATER_TILE_CLEAR:
if (TilePixelHeight(tile) == 0 || IsTileOwner(tile, OWNER_WATER)) { if (TilePixelHeight(tile) == 0 || IsTileOwner(tile, OWNER_WATER)) {
td->str = STR_3804_WATER; td->str = STR_3804_WATER;
} else { } else {
td->str = STR_LANDINFO_CANAL; td->str = STR_LANDINFO_CANAL;
} }
break; break;
case WATER_COAST: td->str = STR_3805_COAST_OR_RIVERBANK; break; case WATER_TILE_COAST: td->str = STR_3805_COAST_OR_RIVERBANK; break;
case WATER_LOCK : td->str = STR_LANDINFO_LOCK; break; case WATER_TILE_LOCK : td->str = STR_LANDINFO_LOCK; break;
case WATER_DEPOT: td->str = STR_3806_SHIP_DEPOT; break; case WATER_TILE_DEPOT: td->str = STR_3806_SHIP_DEPOT; break;
default: assert(0); break; default: assert(0); break;
} }
@ -705,10 +705,10 @@ static uint32 GetTileTrackStatus_Water(TileIndex tile, TransportType mode)
if (mode != TRANSPORT_WATER) return 0; if (mode != TRANSPORT_WATER) return 0;
switch (GetWaterTileType(tile)) { switch (GetWaterTileType(tile)) {
case WATER_CLEAR: ts = TRACK_BIT_ALL; break; case WATER_TILE_CLEAR: ts = TRACK_BIT_ALL; break;
case WATER_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break; case WATER_TILE_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break;
case WATER_LOCK: ts = AxisToTrackBits(DiagDirToAxis(GetLockDirection(tile))); break; case WATER_TILE_LOCK: ts = AxisToTrackBits(DiagDirToAxis(GetLockDirection(tile))); break;
case WATER_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break; case WATER_TILE_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break;
default: return 0; default: return 0;
} }
if (TileX(tile) == 0) { if (TileX(tile) == 0) {
@ -724,7 +724,7 @@ static uint32 GetTileTrackStatus_Water(TileIndex tile, TransportType mode)
static void ClickTile_Water(TileIndex tile) static void ClickTile_Water(TileIndex tile)
{ {
if (GetWaterTileType(tile) == WATER_DEPOT) { if (GetWaterTileType(tile) == WATER_TILE_DEPOT) {
TileIndex tile2 = GetOtherShipDepotTile(tile); TileIndex tile2 = GetOtherShipDepotTile(tile);
ShowDepotWindow(tile < tile2 ? tile : tile2, VEH_Ship); ShowDepotWindow(tile < tile2 ? tile : tile2, VEH_Ship);

22
src/water_map.h
View File

@ -4,10 +4,10 @@
#define WATER_MAP_H #define WATER_MAP_H
typedef enum WaterTileType { typedef enum WaterTileType {
WATER_CLEAR, WATER_TILE_CLEAR,
WATER_COAST, WATER_TILE_COAST,
WATER_LOCK, WATER_TILE_LOCK,
WATER_DEPOT, WATER_TILE_DEPOT,
} WaterTileType; } WaterTileType;
typedef enum DepotPart { typedef enum DepotPart {
@ -25,22 +25,22 @@ typedef enum LockPart {
static inline WaterTileType GetWaterTileType(TileIndex t) static inline WaterTileType GetWaterTileType(TileIndex t)
{ {
if (_m[t].m5 == 0) return WATER_CLEAR; if (_m[t].m5 == 0) return WATER_TILE_CLEAR;
if (_m[t].m5 == 1) return WATER_COAST; if (_m[t].m5 == 1) return WATER_TILE_COAST;
if (IS_INT_INSIDE(_m[t].m5, LOCK_MIDDLE, LOCK_END)) return WATER_LOCK; if (IS_INT_INSIDE(_m[t].m5, LOCK_MIDDLE, LOCK_END)) return WATER_TILE_LOCK;
assert(IS_INT_INSIDE(_m[t].m5, DEPOT_NORTH, DEPOT_END)); assert(IS_INT_INSIDE(_m[t].m5, DEPOT_NORTH, DEPOT_END));
return WATER_DEPOT; return WATER_TILE_DEPOT;
} }
static inline bool IsWater(TileIndex t) static inline bool IsWater(TileIndex t)
{ {
return GetWaterTileType(t) == WATER_CLEAR; return GetWaterTileType(t) == WATER_TILE_CLEAR;
} }
static inline bool IsCoast(TileIndex t) static inline bool IsCoast(TileIndex t)
{ {
return GetWaterTileType(t) == WATER_COAST; return GetWaterTileType(t) == WATER_TILE_COAST;
} }
static inline bool IsClearWaterTile(TileIndex t) static inline bool IsClearWaterTile(TileIndex t)
@ -75,7 +75,7 @@ static inline DiagDirection GetLockDirection(TileIndex t)
static inline byte GetSection(TileIndex t) static inline byte GetSection(TileIndex t)
{ {
assert(GetWaterTileType(t) == WATER_LOCK || GetWaterTileType(t) == WATER_DEPOT); assert(GetWaterTileType(t) == WATER_TILE_LOCK || GetWaterTileType(t) == WATER_TILE_DEPOT);
return GB(_m[t].m5, 0, 4); return GB(_m[t].m5, 0, 4);
} }