dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TBTR: Refactor template replacement code

Browse Source 
Adjust conditions for re-using existing engines in depot
Reduce cost of searching for existing engines in depot
Reduce cost of vehicle chain membership tests
Improve replacement command error handling
Tidy up code in general
This commit is contained in:
Jonathan G Rennison
2023-03-22 00:15:25 +00:00
parent 5d5e005c5d
commit 1707f74d60
9 changed files with 218 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vehicle.cpp
View File

@@ -1638,12 +1638,14 @@ void CallVehicleTicks()
tmpl_cur_company.Change(t->owner);
_new_vehicle_id = INVALID_VEHICLE;
t->vehstatus |= VS_STOPPED;
CommandCost res = DoCommand(t->tile, t->index, leaveDepot ? 1 : 0, DC_EXEC, CMD_TEMPLATE_REPLACE_VEHICLE);
if (res.Succeeded()) {
if (_new_vehicle_id != INVALID_VEHICLE) {
VehicleID t_new = _new_vehicle_id;
t = Train::From(Vehicle::Get(t_new));
t = Train::Get(t_new);
const Company *c = Company::Get(_current_company);
SubtractMoneyFromCompany(CommandCost(EXPENSES_NEW_VEHICLES, (Money)c->settings.engine_renew_money));
CommandCost res2 = DoCommand(0, t_new, 1, DC_EXEC, CMD_AUTOREPLACE_VEHICLE);
@@ -1653,14 +1655,13 @@ void CallVehicleTicks()
if (!IsLocalCompany()) continue;
if (res.Succeeded()) {
if (res.GetCost() != 0) {
ShowCostOrIncomeAnimation(x, y, z, res.GetCost());
}
continue;
if (res.GetCost() != 0) {
ShowCostOrIncomeAnimation(x, y, z, res.GetCost());
}
ShowAutoReplaceAdviceMessage(res, t);
if (res.Failed()) {
ShowAutoReplaceAdviceMessage(res, t);
}
}
tmpl_cur_company.Restore();