gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25865) -Codechange: Refactor detecting of depot vehicle type of a tile to a new function, GetDepotVehicleType (cirdan, LordAro)

Browse Source
This commit is contained in:
zuu 2013-10-13 20:11:05 +00:00
parent 12ddbb7cb1
commit cef1c47f18
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/depot.cpp
View File

@ -44,12 +44,6 @@ Depot::~Depot()
DeleteWindowById(WC_VEHICLE_DEPOT, this->xy); DeleteWindowById(WC_VEHICLE_DEPOT, this->xy);
/* Delete the depot list */ /* Delete the depot list */
VehicleType vt; VehicleType vt = GetDepotVehicleType(this->xy);
switch (GetTileType(this->xy)) {
default: NOT_REACHED();
case MP_RAILWAY: vt = VEH_TRAIN; break;
case MP_ROAD: vt = VEH_ROAD; break;
case MP_WATER: vt = VEH_SHIP; break;
}
DeleteWindowById(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_DEPOT_LIST, vt, GetTileOwner(this->xy), this->index).Pack()); DeleteWindowById(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_DEPOT_LIST, vt, GetTileOwner(this->xy), this->index).Pack());
} }

8
src/depot_cmd.cpp
View File

@ -76,13 +76,7 @@ CommandCost CmdRenameDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
SetWindowDirty(WC_VEHICLE_DEPOT, d->xy); SetWindowDirty(WC_VEHICLE_DEPOT, d->xy);
/* Update the depot list */ /* Update the depot list */
VehicleType vt; VehicleType vt = GetDepotVehicleType(d->xy);
switch (GetTileType(d->xy)) {
default: NOT_REACHED();
case MP_RAILWAY: vt = VEH_TRAIN; break;
case MP_ROAD: vt = VEH_ROAD; break;
case MP_WATER: vt = VEH_SHIP; break;
}
SetWindowDirty(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_DEPOT_LIST, vt, GetTileOwner(d->xy), d->index).Pack()); SetWindowDirty(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_DEPOT_LIST, vt, GetTileOwner(d->xy), d->index).Pack());
} }
return CommandCost(); return CommandCost();

17
src/depot_map.h
View File

@ -55,4 +55,21 @@ static inline DepotID GetDepotIndex(TileIndex t)
return _m[t].m2; return _m[t].m2;
} }
/**
* Get the type of vehicles that can use a depot
* @param t The tile
* @pre IsRailDepotTile(t) || IsRoadDepotTile(t) || IsShipDepotTile(t) || IsTileType(t, MP_STATION)
* @return the type of vehicles that can use the depot
*/
static inline VehicleType GetDepotVehicleType(TileIndex t)
{
switch (GetTileType(t)) {
default: NOT_REACHED();
case MP_RAILWAY: return VEH_TRAIN;
case MP_ROAD: return VEH_ROAD;
case MP_WATER: return VEH_SHIP;
case MP_STATION: return VEH_AIRCRAFT;
}
}
#endif /* DEPOT_MAP_H */ #endif /* DEPOT_MAP_H */

9
src/vehicle_cmd.cpp
View File

@ -85,14 +85,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
/* Elementary check for valid location. */ /* Elementary check for valid location. */
if (!IsDepotTile(tile) || !IsTileOwner(tile, _current_company)) return CMD_ERROR; if (!IsDepotTile(tile) || !IsTileOwner(tile, _current_company)) return CMD_ERROR;
VehicleType type; VehicleType type = GetDepotVehicleType(tile);
switch (GetTileType(tile)) {
case MP_RAILWAY: type = VEH_TRAIN; break;
case MP_ROAD: type = VEH_ROAD; break;
case MP_WATER: type = VEH_SHIP; break;
case MP_STATION: type = VEH_AIRCRAFT; break;
default: NOT_REACHED(); // Safe due to IsDepotTile()
}
/* Validate the engine type. */ /* Validate the engine type. */
EngineID eid = GB(p1, 0, 16); EngineID eid = GB(p1, 0, 16);