diff options
author | tron <tron@openttd.org> | 2007-02-03 07:54:13 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2007-02-03 07:54:13 +0000 |
commit | fc4a53bff00e9cfdfc6b7cf465cbce5850484722 (patch) | |
tree | 4f02b4dab90dfcede26d72a505fa0a6a6fdbae2b /src | |
parent | 8679ce4638fdc19a980b0af0a12db4de2f6badd2 (diff) | |
download | openttd-fc4a53bff00e9cfdfc6b7cf465cbce5850484722.tar.xz |
(svn r8548) -Fix
Remove redundant second retrieval of the AircraftVehicleInfo when building an aircraft
Diffstat (limited to 'src')
-rw-r--r-- | src/aircraft_cmd.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index b3a1bb793..3788efca8 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -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 value; Vehicle *vl[3]; UnitID unit_num; - const AircraftVehicleInfo *avi; 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) 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); - avi = AircraftVehInfo(p1); - // Prevent building aircraft types at places which can't handle them const Station* st = GetStationByTile(tile); const AirportFTAClass* apc = GetAirport(st->airport_type); |