From b64f637c720add4799c38c62b82c2858cdae9e0a Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Mon, 3 Mar 2008 20:56:30 +0000
Subject: [PATCH] (svn r12331) -Feature: [NewGRF] vehicle variable FE bit 8

---
 src/newgrf_engine.cpp | 5 ++---
 src/train_cmd.cpp     | 5 ++++-
 src/vehicle.cpp       | 2 ++
 src/vehicle_base.h    | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 648f469191..ef31b976c9 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -627,16 +627,15 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
 			uint16 modflags = 0;
 
 			if (v->type == VEH_TRAIN) {
-				/* @todo: There are some other bits that should be implemented:
-				 *   bit 8: (Maybe?) Toggled whenever the train reverses.
-				 */
 				const Vehicle *u = IsTrainWagon(v) && HasBit(v->vehicle_flags, VRF_POWEREDWAGON) ? v->First() : v;
 				RailType railtype = GetRailType(v->tile);
 				bool powered = IsTrainEngine(v) || (IsTrainWagon(v) && HasBit(v->vehicle_flags, VRF_POWEREDWAGON));
 				bool has_power = powered && HasPowerOnRail(u->u.rail.railtype, railtype);
 				bool is_electric = powered && u->u.rail.railtype == RAILTYPE_ELECTRIC;
+
 				if (has_power) SetBit(modflags, 5);
 				if (is_electric && !has_power) SetBit(modflags, 6);
+				if (HasBit(v->u.rail.flags, VRF_TOGGLE_REVERSE)) SetBit(modflags, 8);
 			}
 			if (HasBit(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE)) SetBit(modflags, 10);
 
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index f38e395247..f513fbc019 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1787,7 +1787,10 @@ static void ReverseTrainDirection(Vehicle *v)
 	}
 
 	/* update all images */
-	for (Vehicle *u = v; u != NULL; u = u->Next()) { u->cur_image = u->GetImage(u->direction); }
+	for (Vehicle *u = v; u != NULL; u = u->Next()) {
+		ToggleBit(u->u.rail.flags, VRF_TOGGLE_REVERSE);
+		u->cur_image = u->GetImage(u->direction);
+	}
 
 	ClrBit(v->u.rail.flags, VRF_REVERSING);
 
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index e91f243a5a..9eefcb72ce 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2199,6 +2199,8 @@ void VehicleEnterDepot(Vehicle *v)
 			if (!IsFrontEngine(v)) v = v->First();
 			UpdateSignalsOnSegment(v->tile, INVALID_DIAGDIR, v->owner);
 			v->load_unload_time_rem = 0;
+			/* Reset reversed flag */
+			for (Vehicle *u = v; u != NULL; u = u->Next()) ClrBit(u->u.rail.flags, VRF_TOGGLE_REVERSE);
 			break;
 
 		case VEH_ROAD:
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index 3b5464a9da..8bcaa2b475 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -118,7 +118,7 @@ struct VehicleRail {
 	const struct SpriteGroup *cached_override;
 };
 
-enum {
+enum VehicleRailFlags {
 	VRF_REVERSING         = 0,
 
 	/* used to calculate if train is going up or down */
@@ -136,6 +136,9 @@ enum {
 
 	/* used to mark that electric train engine is allowed to run on normal rail */
 	VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL = 6,
+
+	/* used for vehicle var 0xFE bit 8 (toggled each time the train is reversed) */
+	VRF_TOGGLE_REVERSE = 7,
 };
 
 struct VehicleAir {