- event: preserve trains collision on wrap/restart

SoapyMan · SoapyMan · commit 8fb32c3ff257 · 2025-12-13T15:28:06.000+05:00
diff --git a/src_rebuild/Game/C/event.c b/src_rebuild/Game/C/event.c
@@ -1250,10 +1250,7 @@ void SetUpEvents(int full)
 		evt = event;
 
 		// in Beat the train we spawn more train cars
-		if (gCurrentMissionNumber == 22)
-			cCarriages = 9;
-		else
-			cCarriages = 2;
+		cCarriages = (gCurrentMissionNumber == 22) ? 9 : 2;
 
 		for (i = 0; i < cCarriages; i++)
 		{
@@ -2173,12 +2170,12 @@ void StepPathEvent(EVENT* ev)
 		{
 			// [A] preserve direction flag or train will get stuck
 			// i might have been decompiled it wrong but now it works
-			dir = ev->flags & 0x400;
+			// also preserve collision if it has one (for vegas trains)
+			dir = ev->flags & 0x600;
 			
 			InitTrain(ev, 0, GameLevel == 0 ? 0 : 1);
 
-			if (dir)
-				ev->flags |= 0x400;
+			ev->flags |= dir;
 		}
 		else if (ev->flags & 0x400)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1250,10 +1250,7 @@ void SetUpEvents(int full)`
`1250`	`1250`	`evt = event;`
`1251`	`1251`
`1252`	`1252`	`// in Beat the train we spawn more train cars`
`1253`		`- if (gCurrentMissionNumber == 22)`
`1254`		`- cCarriages = 9;`
`1255`		`- else`
`1256`		`- cCarriages = 2;`
	`1253`	`+ cCarriages = (gCurrentMissionNumber == 22) ? 9 : 2;`
`1257`	`1254`
`1258`	`1255`	`for (i = 0; i < cCarriages; i++)`
`1259`	`1256`	`{`
`@@ -2173,12 +2170,12 @@ void StepPathEvent(EVENT* ev)`
`2173`	`2170`	`{`
`2174`	`2171`	`// [A] preserve direction flag or train will get stuck`
`2175`	`2172`	`// i might have been decompiled it wrong but now it works`
`2176`		`- dir = ev->flags & 0x400;`
	`2173`	`+ // also preserve collision if it has one (for vegas trains)`
	`2174`	`+ dir = ev->flags & 0x600;`
`2177`	`2175`
`2178`	`2176`	`InitTrain(ev, 0, GameLevel == 0 ? 0 : 1);`
`2179`	`2177`
`2180`		`- if (dir)`
`2181`		`- ev->flags \|= 0x400;`
	`2178`	`+ ev->flags \|= dir;`
`2182`	`2179`	`}`
`2183`	`2180`	`else if (ev->flags & 0x400)`
`2184`	`2181`	`{`