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

TBTR: Fix front engine not being cleared when being replaced. and kept in depot

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-18 10:17:30 +01:00
parent 49f6490c7d
commit ee06258629
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tbtr_template_vehicle_func.cpp
View File

@@ -330,7 +330,7 @@ void BreakUpRemainders(Train *t)
if (HasBit(t->subtype, GVSF_ENGINE)) { if (HasBit(t->subtype, GVSF_ENGINE)) {
move = t; move = t;
t = t->Next(); t = t->Next();
DoCommand(move->tile, move->index, INVALID_VEHICLE, DC_EXEC, CMD_MOVE_RAIL_VEHICLE); DoCommand(move->tile, move->index | (1 << 22), INVALID_VEHICLE, DC_EXEC, CMD_MOVE_RAIL_VEHICLE);
NeutralizeStatus(move); NeutralizeStatus(move);
} else { } else {
t = t->Next(); t = t->Next();

6
src/train_cmd.cpp
View File

@@ -1371,6 +1371,7 @@ static void NormaliseTrainHead(Train *head)
* - p1 (bit 0 - 19) source vehicle index * - p1 (bit 0 - 19) source vehicle index
* - p1 (bit 20) move all vehicles following the source vehicle * - p1 (bit 20) move all vehicles following the source vehicle
* - p1 (bit 21) this is a virtual vehicle (for creating TemplateVehicles) * - p1 (bit 21) this is a virtual vehicle (for creating TemplateVehicles)
* - p1 (bit 22) when moving a head vehicle, always reset the head state
* @param p2 what wagon to put the source wagon AFTER, XXX - INVALID_VEHICLE to make a new line * @param p2 what wagon to put the source wagon AFTER, XXX - INVALID_VEHICLE to make a new line
* @param text unused * @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
@@ -1380,6 +1381,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
VehicleID s = GB(p1, 0, 20); VehicleID s = GB(p1, 0, 20);
VehicleID d = GB(p2, 0, 20); VehicleID d = GB(p2, 0, 20);
bool move_chain = HasBit(p1, 20); bool move_chain = HasBit(p1, 20);
bool new_head = HasBit(p1, 22);
Train *src = Train::GetIfValid(s); Train *src = Train::GetIfValid(s);
if (src == nullptr) return CMD_ERROR; if (src == nullptr) return CMD_ERROR;
@@ -1515,7 +1517,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
* 6) non front engine gets moved within a train / to another train, nothing hapens * 6) non front engine gets moved within a train / to another train, nothing hapens
* 7) wagon gets moved, nothing happens * 7) wagon gets moved, nothing happens
*/ */
if (src == original_src_head && src->IsEngine() && !src->IsFrontEngine()) { if (src == original_src_head && src->IsEngine() && (!src->IsFrontEngine() || new_head)) {
/* Cases #2 and #3: the front engine gets trashed. */ /* Cases #2 and #3: the front engine gets trashed. */
DeleteWindowById(WC_VEHICLE_VIEW, src->index); DeleteWindowById(WC_VEHICLE_VIEW, src->index);
DeleteWindowById(WC_VEHICLE_ORDERS, src->index); DeleteWindowById(WC_VEHICLE_ORDERS, src->index);
@@ -1538,7 +1540,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
/* We weren't a front engine but are becoming one. So /* We weren't a front engine but are becoming one. So
* we should be put in the default group. */ * we should be put in the default group. */
if (original_src_head != src && dst_head == src) { if ((original_src_head != src || new_head) && dst_head == src) {
SetTrainGroupID(src, DEFAULT_GROUP); SetTrainGroupID(src, DEFAULT_GROUP);
SetWindowDirty(WC_COMPANY, _current_company); SetWindowDirty(WC_COMPANY, _current_company);
} }