summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2011-11-04 00:35:05 +0000
committermichi_cc <michi_cc@openttd.org>2011-11-04 00:35:05 +0000
commitb9841bba816d20de692e159ac6b80ddd0c202fa7 (patch)
tree08d5471dc37316b36a848efb43296362ab9b0c85
parent2886bb1df3323f9b7d9dbead94945cca8ba872ce (diff)
downloadopenttd-b9841bba816d20de692e159ac6b80ddd0c202fa7.tar.xz
(svn r23086) -Feature: [NewGRF] Callback to change refit cost depending on old and new cargo type.
-rw-r--r--src/newgrf_callbacks.h3
-rw-r--r--src/vehicle_cmd.cpp28
2 files changed, 27 insertions, 4 deletions
diff --git a/src/newgrf_callbacks.h b/src/newgrf_callbacks.h
index aabb47e0f..ed283eda5 100644
--- a/src/newgrf_callbacks.h
+++ b/src/newgrf_callbacks.h
@@ -272,6 +272,9 @@ enum CallbackID {
/** Called to determine if one can alter the ground below an object tile */
CBID_OBJECT_AUTOSLOPE = 0x15D, // 15 bit callback
+
+ /** Called to determine the cost factor for refitting a vehicle. */
+ CBID_VEHICLE_REFIT_COST = 0x15E, // 15 bit callback
};
/**
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index b9d7fe4d4..9f088b971 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -31,6 +31,7 @@
#include "company_base.h"
#include "order_backup.h"
#include "ship.h"
+#include "newgrf.h"
#include "table/strings.h"
@@ -206,17 +207,36 @@ CommandCost CmdSellVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
return ret;
}
+/** Helper to run the refit cost callback. */
+static uint GetRefitCostFactor(const Vehicle *v, EngineID engine_type, CargoID new_cid, byte new_subtype)
+{
+ /* Prepare callback param with info about the new cargo type. */
+ const Engine *e = Engine::Get(engine_type);
+ const CargoSpec *cs = CargoSpec::Get(new_cid);
+ uint32 param1 = (cs->classes << 16) | (new_subtype << 8) | e->GetGRF()->cargo_map[new_cid];
+
+ uint16 cb_res = GetVehicleCallback(CBID_VEHICLE_REFIT_COST, param1, 0, engine_type, v);
+ if (cb_res != CALLBACK_FAILED) {
+ return GB(cb_res, 0, 14);
+ }
+
+ return e->info.refit_cost;
+}
+
/**
* Learn the price of refitting a certain engine
+ * @param v The vehicle we are refitting, can be NULL.
* @param engine_type Which engine to refit
+ * @param new_cid Cargo type we are refitting to.
+ * @param new_subtype New cargo subtype.
* @return Price for refitting
*/
-static CommandCost GetRefitCost(EngineID engine_type)
+static CommandCost GetRefitCost(const Vehicle *v, EngineID engine_type, CargoID new_cid, byte new_subtype)
{
ExpensesType expense_type;
const Engine *e = Engine::Get(engine_type);
Price base_price;
- uint cost_factor = e->info.refit_cost;
+ uint cost_factor = GetRefitCostFactor(v, engine_type, new_cid, new_subtype);
switch (e->type) {
case VEH_SHIP:
base_price = PR_BUILD_VEHICLE_SHIP;
@@ -301,7 +321,7 @@ static CommandCost RefitVehicle(Vehicle *v, bool only_this, uint8 num_vehicles,
v->cargo_subtype = temp_subtype;
if (new_cid != v->cargo_type) {
- cost.AddCost(GetRefitCost(v->engine_type));
+ cost.AddCost(GetRefitCost(v, v->engine_type, new_cid, new_subtype));
}
if (flags & DC_EXEC) {
@@ -793,7 +813,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
CargoID initial_cargo = (e->CanCarryCargo() ? e->GetDefaultCargoType() : (CargoID)CT_INVALID);
if (v->cargo_type != initial_cargo && initial_cargo != CT_INVALID) {
- total_cost.AddCost(GetRefitCost(v->engine_type));
+ total_cost.AddCost(GetRefitCost(NULL, v->engine_type, v->cargo_type, v->cargo_subtype));
}
}