diff options
| author | tron <tron@openttd.org> | 2006-05-21 12:01:57 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-05-21 12:01:57 +0000 |
| commit | 65c06663ba1ce57079bffb815a476465e4875cab (patch) | |
| tree | 9c205283cb6d8c8cc73f95e6dff768719a0f557a | |
| parent | 1706164ff7ef6e0da5b05ac2d774fb87b5c349aa (diff) | |
| download | openttd-65c06663ba1ce57079bffb815a476465e4875cab.tar.xz | |
(svn r4938) Remove STATION_HANGAR, because it isn't really a station type of its own
| -rw-r--r-- | smallmap_gui.c | 1 | ||||
| -rw-r--r-- | station_cmd.c | 7 | ||||
| -rw-r--r-- | station_map.c | 1 | ||||
| -rw-r--r-- | station_map.h | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/smallmap_gui.c b/smallmap_gui.c index ee4378756..050534075 100644 --- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -449,7 +449,6 @@ static inline uint32 GetSmallMapRoutesPixels(TileIndex tile) if (t == MP_STATION) { switch (GetStationType(tile)) { case STATION_RAIL: bits = MKCOLOR(0x56565656); break; - case STATION_HANGAR: case STATION_AIRPORT: bits = MKCOLOR(0xB8B8B8B8); break; case STATION_TRUCK: bits = MKCOLOR(0xC2C2C2C2); break; case STATION_BUS: bits = MKCOLOR(0xBFBFBFBF); break; diff --git a/station_cmd.c b/station_cmd.c index 72dce3c90..efce4ac88 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -2119,8 +2119,9 @@ static void GetTileDesc_Station(TileIndex tile, TileDesc *td) switch (GetStationType(tile)) { default: NOT_REACHED(); case STATION_RAIL: str = STR_305E_RAILROAD_STATION; break; - case STATION_HANGAR: str = STR_305F_AIRCRAFT_HANGAR; break; - case STATION_AIRPORT: str = STR_3060_AIRPORT; break; + case STATION_AIRPORT: + str = (IsHangar(tile) ? STR_305F_AIRCRAFT_HANGAR : STR_3060_AIRPORT); + break; case STATION_TRUCK: str = STR_3061_TRUCK_LOADING_AREA; break; case STATION_BUS: str = STR_3062_BUS_STATION; break; case STATION_OILRIG: str = STR_4807_OIL_RIG; break; @@ -2789,7 +2790,6 @@ static int32 ClearTile_Station(TileIndex tile, byte flags) if (flags & DC_AUTO) { switch (GetStationType(tile)) { case STATION_RAIL: return_cmd_error(STR_300B_MUST_DEMOLISH_RAILROAD); - case STATION_HANGAR: case STATION_AIRPORT: return_cmd_error(STR_300E_MUST_DEMOLISH_AIRPORT_FIRST); case STATION_TRUCK: return_cmd_error(STR_3047_MUST_DEMOLISH_TRUCK_STATION); case STATION_BUS: return_cmd_error(STR_3046_MUST_DEMOLISH_BUS_STATION); @@ -2805,7 +2805,6 @@ static int32 ClearTile_Station(TileIndex tile, byte flags) switch (GetStationType(tile)) { case STATION_RAIL: return RemoveRailroadStation(st, tile, flags); - case STATION_HANGAR: case STATION_AIRPORT: return RemoveAirport(st, flags); case STATION_TRUCK: case STATION_BUS: return RemoveRoadStop(st, flags, tile); diff --git a/station_map.c b/station_map.c index 5dea88906..6341cd6ba 100644 --- a/station_map.c +++ b/station_map.c @@ -9,7 +9,6 @@ StationType GetStationType(TileIndex t) { assert(IsTileType(t, MP_STATION)); if (IsRailwayStation(t)) return STATION_RAIL; - if (IsHangar(t)) return STATION_HANGAR; if (IsAirport(t)) return STATION_AIRPORT; if (IsTruckStop(t)) return STATION_TRUCK; if (IsBusStop(t)) return STATION_BUS; diff --git a/station_map.h b/station_map.h index 0e9c949c8..4b4bb8710 100644 --- a/station_map.h +++ b/station_map.h @@ -57,7 +57,6 @@ typedef enum HangarTiles { typedef enum StationType { STATION_RAIL, - STATION_HANGAR, STATION_AIRPORT, STATION_TRUCK, STATION_BUS, |