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

Codechange: Reorder code in autoreplace vehicles.

pull/8480/head
J0anJosep 2021-01-09 17:22:46 +01:00
parent 8a9a627577
commit 6f20beb49a
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/autoreplace_cmd.cpp
View File

@ -28,6 +28,7 @@
#include "order_cmd.h" #include "order_cmd.h"
#include "train_cmd.h" #include "train_cmd.h"
#include "vehicle_cmd.h" #include "vehicle_cmd.h"
#include "depot_map.h"
#include "table/strings.h" #include "table/strings.h"
@ -777,45 +778,45 @@ CommandCost CmdAutoreplaceVehicle(DoCommandFlag flags, VehicleID veh_id)
any_replacements |= (e != INVALID_ENGINE); any_replacements |= (e != INVALID_ENGINE);
w = (!free_wagon && w->type == VEH_TRAIN ? Train::From(w)->GetNextUnit() : nullptr); w = (!free_wagon && w->type == VEH_TRAIN ? Train::From(w)->GetNextUnit() : nullptr);
} }
if (!any_replacements) return_cmd_error(STR_ERROR_AUTOREPLACE_NOTHING_TO_DO);
CommandCost cost = CommandCost(EXPENSES_NEW_VEHICLES, (Money)0); CommandCost cost = CommandCost(EXPENSES_NEW_VEHICLES, (Money)0);
bool nothing_to_do = true; bool nothing_to_do = true;
bool was_stopped = free_wagon || ((v->vehstatus & VS_STOPPED) != 0);
if (any_replacements) { /* Stop the vehicle */
bool was_stopped = free_wagon || ((v->vehstatus & VS_STOPPED) != 0); if (!was_stopped) cost.AddCost(DoCmdStartStopVehicle(v, true));
if (cost.Failed()) return cost;
/* Stop the vehicle */ assert(free_wagon || v->IsStoppedInDepot());
if (!was_stopped) cost.AddCost(DoCmdStartStopVehicle(v, true));
if (cost.Failed()) return cost;
assert(free_wagon || v->IsStoppedInDepot()); /* We have to construct the new vehicle chain to test whether it is valid.
* Vehicle construction needs random bits, so we have to save the random seeds
* to prevent desyncs and to replay newgrf callbacks during DC_EXEC */
SavedRandomSeeds saved_seeds;
SaveRandomSeeds(&saved_seeds);
if (free_wagon) {
cost.AddCost(ReplaceFreeUnit(&v, flags & ~DC_EXEC, &nothing_to_do));
} else {
cost.AddCost(ReplaceChain(&v, flags & ~DC_EXEC, wagon_removal, &nothing_to_do));
}
RestoreRandomSeeds(saved_seeds);
/* We have to construct the new vehicle chain to test whether it is valid. if (cost.Succeeded() && (flags & DC_EXEC) != 0) {
* Vehicle construction needs random bits, so we have to save the random seeds
* to prevent desyncs and to replay newgrf callbacks during DC_EXEC */
SavedRandomSeeds saved_seeds;
SaveRandomSeeds(&saved_seeds);
if (free_wagon) { if (free_wagon) {
cost.AddCost(ReplaceFreeUnit(&v, flags & ~DC_EXEC, &nothing_to_do)); ret = ReplaceFreeUnit(&v, flags, &nothing_to_do);
} else { } else {
cost.AddCost(ReplaceChain(&v, flags & ~DC_EXEC, wagon_removal, &nothing_to_do)); ret = ReplaceChain(&v, flags, wagon_removal, &nothing_to_do);
}
RestoreRandomSeeds(saved_seeds);
if (cost.Succeeded() && (flags & DC_EXEC) != 0) {
if (free_wagon) {
ret = ReplaceFreeUnit(&v, flags, &nothing_to_do);
} else {
ret = ReplaceChain(&v, flags, wagon_removal, &nothing_to_do);
}
assert(ret.Succeeded() && ret.GetCost() == cost.GetCost());
} }
/* Restart the vehicle */ assert(ret.Succeeded());
if (!was_stopped) cost.AddCost(DoCmdStartStopVehicle(v, false)); assert(ret.GetCost() == cost.GetCost());
} }
if (cost.Succeeded() && nothing_to_do) cost = CommandCost(STR_ERROR_AUTOREPLACE_NOTHING_TO_DO); /* Restart the vehicle */
if (!was_stopped) cost.AddCost(DoCmdStartStopVehicle(v, false));
assert(cost.Failed() || !nothing_to_do);
return cost; return cost;
} }