mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r4938) Remove STATION_HANGAR, because it isn't really a station type of its own
This commit is contained in:
parent
1706164ff7
commit
65c06663ba
|
@ -449,7 +449,6 @@ static inline uint32 GetSmallMapRoutesPixels(TileIndex tile)
|
||||||
if (t == MP_STATION) {
|
if (t == MP_STATION) {
|
||||||
switch (GetStationType(tile)) {
|
switch (GetStationType(tile)) {
|
||||||
case STATION_RAIL: bits = MKCOLOR(0x56565656); break;
|
case STATION_RAIL: bits = MKCOLOR(0x56565656); break;
|
||||||
case STATION_HANGAR:
|
|
||||||
case STATION_AIRPORT: bits = MKCOLOR(0xB8B8B8B8); break;
|
case STATION_AIRPORT: bits = MKCOLOR(0xB8B8B8B8); break;
|
||||||
case STATION_TRUCK: bits = MKCOLOR(0xC2C2C2C2); break;
|
case STATION_TRUCK: bits = MKCOLOR(0xC2C2C2C2); break;
|
||||||
case STATION_BUS: bits = MKCOLOR(0xBFBFBFBF); break;
|
case STATION_BUS: bits = MKCOLOR(0xBFBFBFBF); break;
|
||||||
|
|
|
@ -2119,8 +2119,9 @@ static void GetTileDesc_Station(TileIndex tile, TileDesc *td)
|
||||||
switch (GetStationType(tile)) {
|
switch (GetStationType(tile)) {
|
||||||
default: NOT_REACHED();
|
default: NOT_REACHED();
|
||||||
case STATION_RAIL: str = STR_305E_RAILROAD_STATION; break;
|
case STATION_RAIL: str = STR_305E_RAILROAD_STATION; break;
|
||||||
case STATION_HANGAR: str = STR_305F_AIRCRAFT_HANGAR; break;
|
case STATION_AIRPORT:
|
||||||
case STATION_AIRPORT: str = STR_3060_AIRPORT; break;
|
str = (IsHangar(tile) ? STR_305F_AIRCRAFT_HANGAR : STR_3060_AIRPORT);
|
||||||
|
break;
|
||||||
case STATION_TRUCK: str = STR_3061_TRUCK_LOADING_AREA; break;
|
case STATION_TRUCK: str = STR_3061_TRUCK_LOADING_AREA; break;
|
||||||
case STATION_BUS: str = STR_3062_BUS_STATION; break;
|
case STATION_BUS: str = STR_3062_BUS_STATION; break;
|
||||||
case STATION_OILRIG: str = STR_4807_OIL_RIG; 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) {
|
if (flags & DC_AUTO) {
|
||||||
switch (GetStationType(tile)) {
|
switch (GetStationType(tile)) {
|
||||||
case STATION_RAIL: return_cmd_error(STR_300B_MUST_DEMOLISH_RAILROAD);
|
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_AIRPORT: return_cmd_error(STR_300E_MUST_DEMOLISH_AIRPORT_FIRST);
|
||||||
case STATION_TRUCK: return_cmd_error(STR_3047_MUST_DEMOLISH_TRUCK_STATION);
|
case STATION_TRUCK: return_cmd_error(STR_3047_MUST_DEMOLISH_TRUCK_STATION);
|
||||||
case STATION_BUS: return_cmd_error(STR_3046_MUST_DEMOLISH_BUS_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)) {
|
switch (GetStationType(tile)) {
|
||||||
case STATION_RAIL: return RemoveRailroadStation(st, tile, flags);
|
case STATION_RAIL: return RemoveRailroadStation(st, tile, flags);
|
||||||
case STATION_HANGAR:
|
|
||||||
case STATION_AIRPORT: return RemoveAirport(st, flags);
|
case STATION_AIRPORT: return RemoveAirport(st, flags);
|
||||||
case STATION_TRUCK:
|
case STATION_TRUCK:
|
||||||
case STATION_BUS: return RemoveRoadStop(st, flags, tile);
|
case STATION_BUS: return RemoveRoadStop(st, flags, tile);
|
||||||
|
|
|
@ -9,7 +9,6 @@ StationType GetStationType(TileIndex t)
|
||||||
{
|
{
|
||||||
assert(IsTileType(t, MP_STATION));
|
assert(IsTileType(t, MP_STATION));
|
||||||
if (IsRailwayStation(t)) return STATION_RAIL;
|
if (IsRailwayStation(t)) return STATION_RAIL;
|
||||||
if (IsHangar(t)) return STATION_HANGAR;
|
|
||||||
if (IsAirport(t)) return STATION_AIRPORT;
|
if (IsAirport(t)) return STATION_AIRPORT;
|
||||||
if (IsTruckStop(t)) return STATION_TRUCK;
|
if (IsTruckStop(t)) return STATION_TRUCK;
|
||||||
if (IsBusStop(t)) return STATION_BUS;
|
if (IsBusStop(t)) return STATION_BUS;
|
||||||
|
|
|
@ -57,7 +57,6 @@ typedef enum HangarTiles {
|
||||||
|
|
||||||
typedef enum StationType {
|
typedef enum StationType {
|
||||||
STATION_RAIL,
|
STATION_RAIL,
|
||||||
STATION_HANGAR,
|
|
||||||
STATION_AIRPORT,
|
STATION_AIRPORT,
|
||||||
STATION_TRUCK,
|
STATION_TRUCK,
|
||||||
STATION_BUS,
|
STATION_BUS,
|
||||||
|
|
Loading…
Reference in New Issue