Merge 4c7ea26238 into c69fc76395

Codefix: Rail type bridge offset is not a SpriteID. (#14471 )
Fix: Prevent duplicate train reversal when already reversing
2025-07-21 20:02:14 +00:00 · 2025-07-21 20:00:04 +00:00 · 2025-06-01 13:00:14 +03:00 · 2025-06-01 12:40:00 +03:00
2 changed files with 7 additions and 1 deletions
--- a/src/rail.h
+++ b/src/rail.h
@ -184,7 +184,7 @@ public:
 	/**
 	 * Bridge offset
 	 */
-	SpriteID bridge_offset;
+	uint8_t bridge_offset;

 	/**
 	 * Original railtype number to use when drawing non-newgrf railtypes, or when drawing stations.
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@ -1991,6 +1991,8 @@ static bool IsWholeTrainInsideDepot(const Train *v)
 */
 void ReverseTrainDirection(Train *v)
 {
+	//DEBUG(driver, 1, "Reversing train %d on tile %d", v->index, v->tile);
+
 	if (IsRailDepotTile(v->tile)) {
 		if (IsWholeTrainInsideDepot(v)) return;
 		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
@ -3884,6 +3886,9 @@ static TileIndex TrainApproachingCrossingTile(const Train *v)
 */
 static bool TrainCheckIfLineEnds(Train *v, bool reverse)
 {
+
+	if (v->flags.Test(VehicleRailFlag::Reversing)) return false;
+	
 	/* First, handle broken down train */

 	int t = v->breakdown_ctr;
@ -3933,6 +3938,7 @@ static bool TrainCheckIfLineEnds(Train *v, bool reverse)
 }


+
 static bool TrainLocoHandler(Train *v, bool mode)
 {
 	/* train has crashed? */
Author	SHA1	Message	Date
ArtiomGusev	09001fc35d	Merge `4c7ea26238` into `c69fc76395`	2025-07-21 20:02:14 +00:00
Peter Nelson	c69fc76395	Codefix: Rail type bridge offset is not a SpriteID. (#14471 )	2025-07-21 20:00:04 +00:00
ArtiomGusev	4c7ea26238	Fix: Prevent duplicate train reversal when already reversing	2025-06-01 13:00:14 +03:00
ArtiomGusev	e46456d605	Fix: Prevent duplicate train reversal when already reversing	2025-06-01 12:40:00 +03:00