From 943f4fdabb90405ad105a4e30cb6d10eb82b56ef Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Tue, 5 Jun 2018 18:54:59 +0100
Subject: [PATCH] Debug: Add train and RV flags to scope info dump

Move flag dumping to separate function
---
 src/scope_info.cpp | 22 +------------------
 src/vehicle.cpp    | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 src/vehicle_base.h |  2 ++
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/src/scope_info.cpp b/src/scope_info.cpp
index f963757687..b175687a02 100644
--- a/src/scope_info.cpp
+++ b/src/scope_info.cpp
@@ -57,27 +57,7 @@ const char *scope_dumper::VehicleInfo(const Vehicle *v)
 	char *b = this->buffer;
 	const char *last = lastof(this->buffer);
 	auto dump_flags = [&](const Vehicle *u) {
-		auto dump = [&](char c, bool flag) {
-			if (flag) b += seprintf(b, last, "%c", c);
-		};
-		b += seprintf(b, last, "st:");
-		dump('F', HasBit(u->subtype, GVSF_FRONT));
-		dump('A', HasBit(u->subtype, GVSF_ARTICULATED_PART));
-		dump('W', HasBit(u->subtype, GVSF_WAGON));
-		dump('E', HasBit(u->subtype, GVSF_ENGINE));
-		dump('f', HasBit(u->subtype, GVSF_FREE_WAGON));
-		dump('M', HasBit(u->subtype, GVSF_MULTIHEADED));
-		dump('V', HasBit(u->subtype, GVSF_VIRTUAL));
-		b += seprintf(b, last, ", vs:");
-		dump('H', u->vehstatus & VS_HIDDEN);
-		dump('S', u->vehstatus & VS_STOPPED);
-		dump('U', u->vehstatus & VS_UNCLICKABLE);
-		dump('D', u->vehstatus & VS_DEFPAL);
-		dump('s', u->vehstatus & VS_TRAIN_SLOWING);
-		dump('X', u->vehstatus & VS_SHADOW);
-		dump('B', u->vehstatus & VS_AIRCRAFT_BROKEN);
-		dump('C', u->vehstatus & VS_CRASHED);
-		b += seprintf(b, last, ", t:%X", u->tile);
+		b = u->DumpVehicleFlags(b, last);
 	};
 	if (v) {
 		b += seprintf(b, last, "veh: %u: (", v->index);
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index c85ca6e13a..bd59c8f0b8 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -3476,6 +3476,59 @@ void Vehicle::RemoveFromShared()
 	if (HasBit(this->vehicle_flags, VF_TIMETABLE_SEPARATION)) ClrBit(this->vehicle_flags, VF_TIMETABLE_STARTED);
 }
 
+char *Vehicle::DumpVehicleFlags(char *b, const char *last) const
+{
+	auto dump = [&](char c, bool flag) {
+		if (flag) b += seprintf(b, last, "%c", c);
+	};
+	b += seprintf(b, last, "st:");
+	dump('F', HasBit(this->subtype, GVSF_FRONT));
+	dump('A', HasBit(this->subtype, GVSF_ARTICULATED_PART));
+	dump('W', HasBit(this->subtype, GVSF_WAGON));
+	dump('E', HasBit(this->subtype, GVSF_ENGINE));
+	dump('f', HasBit(this->subtype, GVSF_FREE_WAGON));
+	dump('M', HasBit(this->subtype, GVSF_MULTIHEADED));
+	dump('V', HasBit(this->subtype, GVSF_VIRTUAL));
+	b += seprintf(b, last, ", vs:");
+	dump('H', this->vehstatus & VS_HIDDEN);
+	dump('S', this->vehstatus & VS_STOPPED);
+	dump('U', this->vehstatus & VS_UNCLICKABLE);
+	dump('D', this->vehstatus & VS_DEFPAL);
+	dump('s', this->vehstatus & VS_TRAIN_SLOWING);
+	dump('X', this->vehstatus & VS_SHADOW);
+	dump('B', this->vehstatus & VS_AIRCRAFT_BROKEN);
+	dump('C', this->vehstatus & VS_CRASHED);
+	if (this->type == VEH_TRAIN) {
+		const Train *t = Train::From(this);
+		b += seprintf(b, last, ", tf:");
+		dump('R', HasBit(t->flags, VRF_REVERSING));
+		dump('W', HasBit(t->flags, VRF_WAITING_RESTRICTION));
+		dump('S', HasBit(t->flags, VRF_HAVE_SLOT));
+		dump('P', HasBit(t->flags, VRF_POWEREDWAGON));
+		dump('r', HasBit(t->flags, VRF_REVERSE_DIRECTION));
+		dump('h', HasBit(t->flags, VRF_HAS_HIT_RV));
+		dump('e', HasBit(t->flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL));
+		dump('q', HasBit(t->flags, VRF_TOGGLE_REVERSE));
+		dump('s', HasBit(t->flags, VRF_TRAIN_STUCK));
+		dump('L', HasBit(t->flags, VRF_LEAVING_STATION));
+		dump('b', HasBit(t->flags, VRF_BREAKDOWN_BRAKING));
+		dump('p', HasBit(t->flags, VRF_BREAKDOWN_POWER));
+		dump('v', HasBit(t->flags, VRF_BREAKDOWN_SPEED));
+		dump('z', HasBit(t->flags, VRF_BREAKDOWN_STOPPED));
+		dump('F', HasBit(t->flags, VRF_NEED_REPAIR));
+		dump('H', HasBit(t->flags, VRF_TOO_HEAVY));
+		dump('B', HasBit(t->flags, VRF_BEYOND_PLATFORM_END));
+		dump('Y', HasBit(t->flags, VRF_NOT_YET_IN_PLATFORM));
+		dump('A', HasBit(t->flags, VRF_ADVANCE_IN_PLATFORM));
+	} else if (this->type == VEH_ROAD) {
+		const RoadVehicle *r = RoadVehicle::From(this);
+		b += seprintf(b, last, ", rvs:%X, rvf:%X", r->state, r->frame);
+	}
+	b += seprintf(b, last, ", t:%X", this->tile);
+	return b;
+}
+
+
 void VehiclesYearlyLoop()
 {
 	Vehicle *v;
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index 860c5a21c2..a2f37abbd1 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -1060,6 +1060,8 @@ public:
 	{
 		this->sprite_seq_bounds = this->sprite_seq.GetBounds();
 	}
+
+	char *DumpVehicleFlags(char *b, const char *last) const;
 };
 
 /**