Changeset - r6592:a0239a222c0a
[Not reviewed]
master
0 5 0
peter1138 - 18 years ago 2007-05-07 13:26:10
peter1138@openttd.org
(svn r9806) -Codechange: [NewGRF] Add callback 36 support for purchase cost, for all vehicle types.
5 files changed with 14 insertions and 14 deletions:
0 comments (0 inline, 0 general)
src/aircraft_cmd.cpp
Show inline comments
 
@@ -227,9 +227,9 @@ void GetAircraftSpriteSize(EngineID engi
 
	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, u
 
	if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_player)) return_cmd_error(STR_AIRCRAFT_NOT_AVAILABLE);
 

	
 
	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) */
 
	if (flags & DC_QUERY_COST) return value;
src/build_vehicle_gui.cpp
Show inline comments
 
@@ -379,7 +379,7 @@ static const StringID _sort_listing[][10
 
static int DrawRailWagonPurchaseInfo(int x, int y, EngineID engine_number, const RailVehicleInfo *rvi)
 
{
 
	/* 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);
 
	y += 10;
 

	
 
@@ -404,7 +404,7 @@ static int DrawRailEnginePurchaseInfo(in
 
	int multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0);
 

	
 
	/* 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);
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_WEIGHT, 0);
 
	y += 10;
 
@@ -444,7 +444,7 @@ static int DrawRoadVehPurchaseInfo(int x
 
	bool refittable = (_engine_info[engine_number].refit_mask != 0);
 

	
 
	/* 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);
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
 
	y += 10;
 
@@ -468,7 +468,7 @@ static int DrawRoadVehPurchaseInfo(int x
 
static int DrawShipPurchaseInfo(int x, int y, EngineID engine_number, const ShipVehicleInfo *svi)
 
{
 
	/* 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);
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
 
	y += 10;
 
@@ -494,7 +494,7 @@ static int DrawAircraftPurchaseInfo(int 
 
	CargoID cargo;
 

	
 
	/* 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);
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
 
	y += 10;
src/roadveh_cmd.cpp
Show inline comments
 
@@ -117,7 +117,7 @@ void DrawRoadVehEngine(int x, int y, Eng
 

	
 
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.
src/ship_cmd.cpp
Show inline comments
 
@@ -421,7 +421,7 @@ static bool ShipAccelerate(Vehicle *v)
 

	
 
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)
src/train_cmd.cpp
Show inline comments
 
@@ -566,7 +566,7 @@ static int32 CmdBuildRailWagon(EngineID 
 
	SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
 

	
 
	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);
 

	
 
@@ -666,9 +666,9 @@ static void NormalizeTrainVehInDepot(con
 
	}
 
}
 

	
 
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)
 
@@ -728,7 +728,7 @@ int32 CmdBuildRailVehicle(TileIndex tile
 

	
 
	if (rvi->railveh_type == RAILVEH_WAGON) return CmdBuildRailWagon(p1, tile, flags);
 

	
 
	int32 value = EstimateTrainCost(rvi);
 
	int32 value = EstimateTrainCost(p1, rvi);
 

	
 
	uint num_vehicles =
 
		(rvi->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1) +
0 comments (0 inline, 0 general)