summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/group_cmd.cpp2
-rw-r--r--src/train_cmd.cpp9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 59b799d9e..63e8f99fe 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -373,7 +373,7 @@ void SetTrainGroupID(Train *v, GroupID new_g)
{
if (!Group::IsValidID(new_g) && !IsDefaultGroupID(new_g)) return;
- assert(v->IsFrontEngine());
+ assert(v->IsFrontEngine() || IsDefaultGroupID(new_g));
for (Vehicle *u = v; u != NULL; u = u->Next()) {
if (u->IsEngineCountable()) UpdateNumEngineGroup(u->engine_type, u->group_id, new_g);
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 3f9d81dac..3cd80ed0a 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1441,8 +1441,13 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
/* We are going to be move to another train. So we
* are no part of this group anymore. In case we
* are not moving group... well, then we do not need
- * to move. */
- if (dst_head != NULL && dst_head != src) DecreaseGroupNumVehicle(src->group_id);
+ * to move.
+ * Or we are moving to later in the train and our
+ * new head isn't a front engine anymore.
+ */
+ if (dst_head != NULL ? dst_head != src : !src_head->IsFrontEngine()) {
+ DecreaseGroupNumVehicle(src->group_id);
+ }
/* Delete orders, group stuff and the unit number as we're not the
* front of any vehicle anymore. */