|
@@ -1609,25 +1609,25 @@ static void MoveVehicleCargo(Vehicle *de
|
|
|
*/
|
|
|
static int32 ReplaceVehicle(Vehicle **w, byte flags)
|
|
|
{
|
|
|
int32 cost;
|
|
|
Vehicle *old_v = *w;
|
|
|
const Player *p = GetPlayer(old_v->owner);
|
|
|
EngineID new_engine_type;
|
|
|
const UnitID cached_unitnumber = old_v->unitnumber;
|
|
|
bool new_front = false;
|
|
|
Vehicle *new_v = NULL;
|
|
|
char vehicle_name[32];
|
|
|
|
|
|
new_engine_type = EngineReplacement(p, old_v->engine_type);
|
|
|
new_engine_type = EngineReplacementForPlayer(p, old_v->engine_type);
|
|
|
if (new_engine_type == INVALID_ENGINE) new_engine_type = old_v->engine_type;
|
|
|
|
|
|
cost = DoCommand(old_v->x_pos, old_v->y_pos, new_engine_type, 1, flags, CMD_BUILD_VEH(old_v->type));
|
|
|
if (CmdFailed(cost)) return cost;
|
|
|
|
|
|
if (flags & DC_EXEC) {
|
|
|
new_v = GetVehicle(_new_vehicle_id);
|
|
|
*w = new_v; //we changed the vehicle, so MaybeReplaceVehicle needs to work on the new one. Now we tell it what the new one is
|
|
|
|
|
|
/* refit if needed */
|
|
|
if (new_v->type != VEH_Road) { // road vehicles can't be refitted
|
|
|
if (old_v->cargo_type != new_v->cargo_type && old_v->cargo_cap != 0 && new_v->cargo_cap != 0) {// some train engines do not have cargo capacity
|
|
@@ -1730,25 +1730,25 @@ static void MaybeReplaceVehicle(Vehicle
|
|
|
cost = 0;
|
|
|
w = v;
|
|
|
do {
|
|
|
if (w->type == VEH_Train && IsMultiheaded(w) && !IsTrainEngine(w)) {
|
|
|
/* we build the rear ends of multiheaded trains with the front ones */
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
// check if the vehicle should be replaced
|
|
|
if (!p->engine_renew ||
|
|
|
w->age - w->max_age < (p->engine_renew_months * 30) || // replace if engine is too old
|
|
|
w->max_age == 0) { // rail cars got a max age of 0
|
|
|
if (!EngineHasReplacement(p, w->engine_type)) // updates to a new model
|
|
|
if (!EngineHasReplacementForPlayer(p, w->engine_type)) // updates to a new model
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
/* Now replace the vehicle */
|
|
|
temp_cost = ReplaceVehicle(&w, flags);
|
|
|
|
|
|
if (flags & DC_EXEC &&
|
|
|
(w->type != VEH_Train || w->u.rail.first_engine == INVALID_VEHICLE)) {
|
|
|
/* now we bought a new engine and sold the old one. We need to fix the
|
|
|
* pointers in order to avoid pointing to the old one for trains: these
|
|
|
* pointers should point to the front engine and not the cars
|
|
|
*/
|