Mercurial > hg > openttd

changeset 13815:0625b5332bcc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r18341) -Fix: Replace some GetNextVehicle() with GetNextUnit() where needed.
author frosch <frosch@openttd.org>
date Sun, 29 Nov 2009 18:46:54 +0000
parents 301108e43a55
children f6271037a1a0
files src/train_cmd.cpp
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1174,7 +1174,8 @@
 			 * row that are being moved. */
 			if (HasBit(p2, 0)) {
 				const Train *u;
-				for (u = src_head; u != src && u != NULL; u = u->GetNextVehicle()) {
+				/* CheckTrainStoppedInDepot() does counts dual-headed engines only once, so also do it here */
+				for (u = src_head; u != src && u != NULL; u = u->GetNextUnit()) {
 					src_len--;
 				}
 			} else {
@@ -1326,7 +1327,7 @@
 		/* If we move the front Engine and if the second vehicle is not an engine
 		   add the whole vehicle to the DEFAULT_GROUP */
 		if (src->IsFrontEngine() && !IsDefaultGroupID(src->group_id)) {
-			Train *v = src->GetNextVehicle();
+			Train *v = src->GetNextUnit();
 
 			if (v != NULL && v->IsEngine()) {
 				v->group_id   = src->group_id;
@@ -1520,7 +1521,7 @@
 			/* 2. We are selling the front vehicle, some special action might be required
 			 * here, so take attention */
 			if (v == first) {
-				Train *new_f = first->GetNextVehicle();
+				Train *new_f = first->GetNextUnit();
 
 				/* 2.2 If there are wagons present after the deleted front engine, check
 				 * if the second wagon (which will be first) is an engine. If it is one,