mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9806) -Codechange: [NewGRF] Add callback 36 support for purchase cost, for all vehicle types.

release/0.6
peter1138 2007-05-07 13:26:10 +00:00
parent 0de85b7eb0
commit 4591fb5b0d
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aircraft_cmd.cpp
View File

@ -227,9 +227,9 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height)
height = spr->height; height = spr->height;
} }
static int32 EstimateAircraftCost(const AircraftVehicleInfo *avi) static int32 EstimateAircraftCost(EngineID engine, const AircraftVehicleInfo *avi)
{ {
return avi->base_cost * (_price.aircraft_base >> 3) >> 5; return GetEngineProperty(engine, 0x0B, avi->base_cost) * (_price.aircraft_base >> 3) >> 5;
} }
@ -270,7 +270,7 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_player)) return_cmd_error(STR_AIRCRAFT_NOT_AVAILABLE); if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_player)) return_cmd_error(STR_AIRCRAFT_NOT_AVAILABLE);
const AircraftVehicleInfo *avi = AircraftVehInfo(p1); const AircraftVehicleInfo *avi = AircraftVehInfo(p1);
int32 value = EstimateAircraftCost(avi); int32 value = EstimateAircraftCost(p1, 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;

10
src/build_vehicle_gui.cpp
View File

@ -379,7 +379,7 @@ static const StringID _sort_listing[][10] = {{
static int DrawRailWagonPurchaseInfo(int x, int y, EngineID engine_number, const RailVehicleInfo *rvi) static int DrawRailWagonPurchaseInfo(int x, int y, EngineID engine_number, const RailVehicleInfo *rvi)
{ {
/* Purchase cost */ /* Purchase cost */
SetDParam(0, (rvi->base_cost * _price.build_railwagon) >> 8); SetDParam(0, (GetEngineProperty(engine_number, 0x17, rvi->base_cost) * _price.build_railwagon) >> 8);
DrawString(x, y, STR_PURCHASE_INFO_COST, 0); DrawString(x, y, STR_PURCHASE_INFO_COST, 0);
y += 10; y += 10;
@ -404,7 +404,7 @@ static int DrawRailEnginePurchaseInfo(int x, int y, EngineID engine_number, cons
int multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0); int multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0);
/* Purchase Cost - Engine weight */ /* Purchase Cost - Engine weight */
SetDParam(0, rvi->base_cost * (_price.build_railvehicle >> 3) >> 5); SetDParam(0, GetEngineProperty(engine_number, 0x17, rvi->base_cost) * (_price.build_railvehicle >> 3) >> 5);
SetDParam(1, rvi->weight << multihead); SetDParam(1, rvi->weight << multihead);
DrawString(x, y, STR_PURCHASE_INFO_COST_WEIGHT, 0); DrawString(x, y, STR_PURCHASE_INFO_COST_WEIGHT, 0);
y += 10; y += 10;
@ -444,7 +444,7 @@ static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number, const R
bool refittable = (_engine_info[engine_number].refit_mask != 0); bool refittable = (_engine_info[engine_number].refit_mask != 0);
/* Purchase cost - Max speed */ /* Purchase cost - Max speed */
SetDParam(0, rvi->base_cost * (_price.roadveh_base >> 3) >> 5); SetDParam(0, GetEngineProperty(engine_number, 0x11, rvi->base_cost) * (_price.roadveh_base >> 3) >> 5);
SetDParam(1, rvi->max_speed * 10 / 32); SetDParam(1, rvi->max_speed * 10 / 32);
DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0); DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
y += 10; y += 10;
@ -468,7 +468,7 @@ static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number, const R
static int DrawShipPurchaseInfo(int x, int y, EngineID engine_number, const ShipVehicleInfo *svi) static int DrawShipPurchaseInfo(int x, int y, EngineID engine_number, const ShipVehicleInfo *svi)
{ {
/* Purchase cost - Max speed */ /* Purchase cost - Max speed */
SetDParam(0, svi->base_cost * (_price.ship_base >> 3) >> 5); SetDParam(0, GetEngineProperty(engine_number, 0x0A, svi->base_cost) * (_price.ship_base >> 3) >> 5);
SetDParam(1, svi->max_speed * 10 / 32); SetDParam(1, svi->max_speed * 10 / 32);
DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0); DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
y += 10; y += 10;
@ -494,7 +494,7 @@ static int DrawAircraftPurchaseInfo(int x, int y, EngineID engine_number, const
CargoID cargo; CargoID cargo;
/* Purchase cost - Max speed */ /* Purchase cost - Max speed */
SetDParam(0, avi->base_cost * (_price.aircraft_base >> 3) >> 5); SetDParam(0, GetEngineProperty(engine_number, 0x0B, avi->base_cost) * (_price.aircraft_base >> 3) >> 5);
SetDParam(1, avi->max_speed * 10 / 16); SetDParam(1, avi->max_speed * 10 / 16);
DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0); DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
y += 10; y += 10;

2
src/roadveh_cmd.cpp
View File

@ -117,7 +117,7 @@ void DrawRoadVehEngine(int x, int y, EngineID engine, SpriteID pal)
static int32 EstimateRoadVehCost(EngineID engine_type) static int32 EstimateRoadVehCost(EngineID engine_type)
{ {
return ((_price.roadveh_base >> 3) * RoadVehInfo(engine_type)->base_cost) >> 5; return ((_price.roadveh_base >> 3) * GetEngineProperty(engine_type, 0x11, RoadVehInfo(engine_type)->base_cost)) >> 5;
} }
/** Build a road vehicle. /** Build a road vehicle.

2
src/ship_cmd.cpp
View File

@ -421,7 +421,7 @@ static bool ShipAccelerate(Vehicle *v)
static int32 EstimateShipCost(EngineID engine_type) static int32 EstimateShipCost(EngineID engine_type)
{ {
return ShipVehInfo(engine_type)->base_cost * (_price.ship_base>>3)>>5; return GetEngineProperty(engine_type, 0x0A, ShipVehInfo(engine_type)->base_cost) * (_price.ship_base>>3)>>5;
} }
static void ShipArrivesAt(const Vehicle* v, Station* st) static void ShipArrivesAt(const Vehicle* v, Station* st)

8
src/train_cmd.cpp
View File

@ -566,7 +566,7 @@ static int32 CmdBuildRailWagon(EngineID engine, TileIndex tile, uint32 flags)
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
const RailVehicleInfo *rvi = RailVehInfo(engine); const RailVehicleInfo *rvi = RailVehInfo(engine);
int32 value = (rvi->base_cost * _price.build_railwagon) >> 8; int32 value = (GetEngineProperty(engine, 0x17, rvi->base_cost) * _price.build_railwagon) >> 8;
uint num_vehicles = 1 + CountArticulatedParts(engine); uint num_vehicles = 1 + CountArticulatedParts(engine);
@ -666,9 +666,9 @@ static void NormalizeTrainVehInDepot(const Vehicle* u)
} }
} }
static int32 EstimateTrainCost(const RailVehicleInfo* rvi) static int32 EstimateTrainCost(EngineID engine, const RailVehicleInfo* rvi)
{ {
return rvi->base_cost * (_price.build_railvehicle >> 3) >> 5; return GetEngineProperty(engine, 0x17, rvi->base_cost) * (_price.build_railvehicle >> 3) >> 5;
} }
static void AddRearEngineToMultiheadedTrain(Vehicle* v, Vehicle* u, bool building) static void AddRearEngineToMultiheadedTrain(Vehicle* v, Vehicle* u, bool building)
@ -728,7 +728,7 @@ int32 CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (rvi->railveh_type == RAILVEH_WAGON) return CmdBuildRailWagon(p1, tile, flags); if (rvi->railveh_type == RAILVEH_WAGON) return CmdBuildRailWagon(p1, tile, flags);
int32 value = EstimateTrainCost(rvi); int32 value = EstimateTrainCost(p1, rvi);
uint num_vehicles = uint num_vehicles =
(rvi->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1) + (rvi->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1) +