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

TBTR: Fix cost estimation of replacement when using wagon attach callbacks

Browse Source 
Do not CMD_SELL_VEHICLE in cost estimation, just use the vehicle values
This commit is contained in:
Jonathan G Rennison
2024-03-29 16:09:13 +00:00
parent 0ba9d9bb18
commit 3439d208d7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/train_cmd.cpp
View File

@@ -7367,10 +7367,15 @@ CommandCost CmdTemplateReplaceVehicle(TileIndex tile, DoCommandFlag flags, uint3
if (!tv->IsSetKeepRemainingVehicles()) { if (!tv->IsSetKeepRemainingVehicles()) {
/* Sell leftovers */ /* Sell leftovers */
for (const Train *u : in) { for (const Train *u : in) {
buy.AddCost(DoCommand(u->tile, u->index, 0, flags, CMD_SELL_VEHICLE)); /* Do not dry-run selling each part using CMD_SELL_VEHICLE because this can fail due to consist/wagon-attachment callbacks */
buy.AddCost(-u->value);
if (u->other_multiheaded_part != nullptr) {
buy.AddCost(-u->other_multiheaded_part->value);
}
} }
} }
} }
if (buy.Failed()) buy.MultiplyCost(0);
return buy; return buy;
} }