Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 562431de6580 · 2024-10-13T10:41:24.000Z
f1991d0 Small improvements for #3592 (#3792)
diff --git a/Client/game_sa/CVehicleSA.cpp b/Client/game_sa/CVehicleSA.cpp
@@ -1592,9 +1592,10 @@ bool CVehicleSA::SpawnFlyingComponent(const eCarNodes& nodeIndex, const eCarComp
     if (removalTime <= -1 || !componentObject)
         return true;
 
-    std::uint32_t CTimer_ms = *reinterpret_cast<std::uint32_t*>(VAR_CTimer_snTimeInMilliseconds);
-    componentObject->uiObjectRemovalTime = CTimer_ms + static_cast<std::uint32_t>(removalTime);
+    // Set double-sided
+    componentObject->bBackfaceCulled = true;
 
+    componentObject->uiObjectRemovalTime = pGame->GetSystemTime() + static_cast<std::uint32_t>(removalTime);
     return true;
 }
 
diff --git a/Client/game_sa/CVehicleSA.h b/Client/game_sa/CVehicleSA.h
@@ -106,8 +106,6 @@ struct RwTexture;
 #define OFFSET_CBike_Nodes 0x5A0
 #define OFFSET_CBoat_Nodes 0x5B0
 
-#define VAR_CTimer_snTimeInMilliseconds 0xB7CB84
-
 struct SRailNodeSA
 {
     short sX;                       // x coordinate times 8

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,6 @@ struct RwTexture;`
`106`	`106`	`#define OFFSET_CBike_Nodes 0x5A0`
`107`	`107`	`#define OFFSET_CBoat_Nodes 0x5B0`
`108`	`108`
`109`		`-#define VAR_CTimer_snTimeInMilliseconds 0xB7CB84`
`110`		`-`
`111`	`109`	`struct SRailNodeSA`
`112`	`110`	`{`
`113`	`111`	`short sX; // x coordinate times 8`