From 79ce0def50f4d2c3e9956c9a5e7c93d893c1f465 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Fri, 6 Jan 2006 22:49:00 +0000
Subject: [PATCH] (svn r3378) - NewGRF Fix: Use order status to determine
 whether a vehicle is loading instead  of speed, and get that state from first
 vehicle in a train consist.

---
 engine.c    | 7 ++++++-
 train_cmd.c | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/engine.c b/engine.c
index 20da2c32da..a2e717f1ec 100644
--- a/engine.c
+++ b/engine.c
@@ -608,7 +608,12 @@ int GetCustomEngineSprite(EngineID engine, const Vehicle *v, byte direction)
 
 		if (capacity == 0) capacity = 1;
 		loaded = (v->cargo_count * 100) / capacity;
-		in_motion = (v->cur_speed != 0);
+
+		if (v->type == VEH_Train) {
+			in_motion = GetFirstVehicleInChain(v)->current_order.type != OT_LOADING;
+		} else {
+			in_motion = v->current_order.type != OT_LOADING;
+		}
 	}
 
 	group = GetVehicleSpriteGroup(engine, v);
diff --git a/train_cmd.c b/train_cmd.c
index 8e076e9350..7ae6b10ff3 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -2563,10 +2563,10 @@ static void TrainEnterStation(Vehicle *v, StationID station)
 	SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC);
 	if (LoadUnloadVehicle(v) != 0) {
 		InvalidateWindow(WC_TRAINS_LIST, v->owner);
-		MarkTrainDirty(v);
 		TrainCargoChanged(v);
 		UpdateTrainAcceleration(v);
 	}
+	MarkTrainDirty(v);
 	InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 }