gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-07 06:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8547) -Fix

Browse Source 
Remove redundant second retrieval of the station and airport when building an aircraft
This commit is contained in:
tron 2007-02-03 07:47:00 +00:00
parent 500f9a971a
commit feab2ace94
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aircraft_cmd.cpp
View File

@ -210,7 +210,6 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
Vehicle *vl[3]; Vehicle *vl[3];
UnitID unit_num; UnitID unit_num;
const AircraftVehicleInfo *avi; const AircraftVehicleInfo *avi;
const AirportFTAClass* ap;
if (!IsEngineBuildable(p1, VEH_Aircraft, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); if (!IsEngineBuildable(p1, VEH_Aircraft, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE);
@ -226,8 +225,9 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
avi = AircraftVehInfo(p1); avi = AircraftVehInfo(p1);
// Prevent building aircraft types at places which can't handle them // Prevent building aircraft types at places which can't handle them
ap = GetAirport(GetStationByTile(tile)->airport_type); const Station* st = GetStationByTile(tile);
if ((avi->subtype & AIR_CTOL ? HELICOPTERS_ONLY : AIRCRAFT_ONLY) == ap->acc_planes) { const AirportFTAClass* apc = GetAirport(st->airport_type);
if ((avi->subtype & AIR_CTOL ? HELICOPTERS_ONLY : AIRCRAFT_ONLY) == apc->acc_planes) {
return CMD_ERROR; return CMD_ERROR;
} }
@ -348,8 +348,6 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
* layout for #th position of depot. Since layout must start with a listing * layout for #th position of depot. Since layout must start with a listing
* of all depots, it is simple */ * of all depots, it is simple */
{ {
const Station* st = GetStationByTile(tile);
const AirportFTAClass* apc = GetAirport(st->airport_type);
uint i; uint i;
for (i = 0; i < apc->nof_depots; i++) { for (i = 0; i < apc->nof_depots; i++) {