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

(svn r8548) -Fix

Browse Source 
Remove redundant second retrieval of the AircraftVehicleInfo when building an aircraft
This commit is contained in:
tron 2007-02-03 07:54:13 +00:00
parent feab2ace94
commit c3d971c855
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/aircraft_cmd.cpp
View File

@ -165,9 +165,9 @@ void DrawAircraftEngine(int x, int y, EngineID engine, SpriteID pal)
} }
} }
static int32 EstimateAircraftCost(EngineID engine_type) static int32 EstimateAircraftCost(const AircraftVehicleInfo *avi)
{ {
return AircraftVehInfo(engine_type)->base_cost * (_price.aircraft_base>>3)>>5; return avi->base_cost * (_price.aircraft_base >> 3) >> 5;
} }
@ -206,14 +206,13 @@ uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type)
*/ */
int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{ {
int32 value;
Vehicle *vl[3]; Vehicle *vl[3];
UnitID unit_num; UnitID unit_num;
const AircraftVehicleInfo *avi;
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);
value = EstimateAircraftCost(p1); const AircraftVehicleInfo *avi = AircraftVehInfo(p1);
int32 value = EstimateAircraftCost(avi);
// to just query the cost, it is not neccessary to have a valid tile (automation/AI) // to just query the cost, it is not neccessary to have a valid tile (automation/AI)
if (flags & DC_QUERY_COST) return value; if (flags & DC_QUERY_COST) return value;
@ -222,8 +221,6 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
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
const Station* st = GetStationByTile(tile); const Station* st = GetStationByTile(tile);
const AirportFTAClass* apc = GetAirport(st->airport_type); const AirportFTAClass* apc = GetAirport(st->airport_type);