Merge Don't attempt to reload collisions (pr-3573)

prikolium-cfx · prikolium-cfx · commit d9b553a95e87 · 2025-08-08T10:37:17.000+02:00
c0274dc - fix(streaming/rdr3): don't attempt to reload collisions
diff --git a/code/components/gta-streaming-five/src/LoadStreamingFile.cpp b/code/components/gta-streaming-five/src/LoadStreamingFile.cpp
@@ -1116,7 +1116,10 @@ static void ReloadMapStore()
 #endif
 		   )
 		{
+			// currently, Reloading custom collision causes it to break in RDR3
+#ifndef IS_RDR3
 			collisionFiles.push_back(std::make_pair(file, obj));
+#endif
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,10 @@ static void ReloadMapStore()`
`1116`	`1116`	`#endif`
`1117`	`1117`	`)`
`1118`	`1118`	`{`
	`1119`	`+ // currently, Reloading custom collision causes it to break in RDR3`
	`1120`	`+#ifndef IS_RDR3`
`1119`	`1121`	`collisionFiles.push_back(std::make_pair(file, obj));`
	`1122`	`+#endif`
`1120`	`1123`	`}`
`1121`	`1124`	`else`
`1122`	`1125`	`{`