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

Codechange: Unify the tests whether build+refit is in simulation-test or real-run.

pull/8109/head
frosch 2020-05-03 22:04:16 +02:00 committed by frosch
parent fb5fc0d80a
commit 68244393f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle_cmd.cpp
View File

@ -145,7 +145,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
} }
if (value.Succeeded()) { if (value.Succeeded()) {
if (refitting || (flags & DC_EXEC)) { if (subflags & DC_EXEC) {
v->unitnumber = unit_num; v->unitnumber = unit_num;
v->value = value.GetCost(); v->value = value.GetCost();
} }
@ -166,7 +166,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
} }
} }
if (refitting || (flags & DC_EXEC)) { if (subflags & DC_EXEC) {
GroupStatistics::CountEngine(v, 1); GroupStatistics::CountEngine(v, 1);
GroupStatistics::UpdateAutoreplace(_current_company); GroupStatistics::UpdateAutoreplace(_current_company);
@ -178,7 +178,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
/* If we are not in DC_EXEC undo everything */ /* If we are not in DC_EXEC undo everything */
if (refitting && (flags & DC_EXEC) == 0) { if (flags != subflags) {
DoCommand(0, v->index, 0, DC_EXEC, GetCmdSellVeh(v)); DoCommand(0, v->index, 0, DC_EXEC, GetCmdSellVeh(v));
} }
} }