Requested changes & fixes

Xenius97 · Xenius97 · commit 360e379acceb · 2025-11-22T17:01:24.000+01:00
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -2550,15 +2550,15 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
 
     // Grass draw distance
     bool  bOverrideGrassDrawDistance = false;
-    float fGrassCloseDistance, fGrassFarDistance;
+    float grassCloseDistance, grassFarDistance;
     if (!bitStream.ReadBit(bOverrideGrassDrawDistance))
         return;
     if (bOverrideGrassDrawDistance)
     {
-        if (!bitStream.Read(fGrassCloseDistance) || !bitStream.Read(fGrassFarDistance))
+        if (!bitStream.Read(grassCloseDistance) || !bitStream.Read(grassFarDistance))
             return;
 
-        g_pMultiplayer->SetGrassDrawDistance(fGrassCloseDistance, fGrassFarDistance);
+        g_pMultiplayer->SetGrassDrawDistance(grassCloseDistance, grassFarDistance);
     }
 
     // Aircraft max height
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp
@@ -1825,21 +1825,19 @@ int CLuaWorldDefs::ResetFogDistance(lua_State* luaVM)
 
 CLuaMultiReturn<float, float> CLuaWorldDefs::GetGrassDrawDistance()
 {
-    float fCloseDistance, fFarDistance;
-    g_pMultiplayer->GetGrassDrawDistance(fCloseDistance, fFarDistance);
-    return {fCloseDistance, fFarDistance};
+    float closeDistance, farDistance;
+    g_pMultiplayer->GetGrassDrawDistance(closeDistance, farDistance);
+    return {closeDistance, farDistance};
 }
 
-bool CLuaWorldDefs::SetGrassDrawDistance(float closeDistance, float farDistance)
+void CLuaWorldDefs::SetGrassDrawDistance(float closeDistance, float farDistance)
 {
     g_pMultiplayer->SetGrassDrawDistance(closeDistance, farDistance);
-    return true;
 }
 
-bool CLuaWorldDefs::ResetGrassDrawDistance()
+void CLuaWorldDefs::ResetGrassDrawDistance()
 {
     g_pMultiplayer->ResetGrassDrawDistance();
-    return true;
 }
 
 int CLuaWorldDefs::GetSunColor(lua_State* luaVM)
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h
@@ -91,8 +91,8 @@ class CLuaWorldDefs : public CLuaDefs
     LUA_DECLARE(SetFogDistance);
     LUA_DECLARE(ResetFogDistance);
     static CLuaMultiReturn<float, float> GetGrassDrawDistance();
-    static bool SetGrassDrawDistance(float closeDistance, float farDistance);
-    static bool ResetGrassDrawDistance();
+    static void SetGrassDrawDistance(float closeDistance, float farDistance);
+    static void ResetGrassDrawDistance();
     LUA_DECLARE(GetSunColor);
     LUA_DECLARE(SetSunColor);
     LUA_DECLARE(ResetSunColor);
diff --git a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp
@@ -359,11 +359,11 @@ void CWorldRPCs::SetFogDistance(NetBitStreamInterface& bitStream)
 
 void CWorldRPCs::SetGrassDrawDistance(NetBitStreamInterface& bitStream)
 {
-    float fCloseDistance, fFarDistance;
+    float closeDistance, farDistance;
 
-    if (bitStream.Read(fCloseDistance) && bitStream.Read(fFarDistance))
+    if (bitStream.Read(closeDistance) && bitStream.Read(farDistance))
     {
-        g_pMultiplayer->SetGrassDrawDistance(fCloseDistance, fFarDistance);
+        g_pMultiplayer->SetGrassDrawDistance(closeDistance, farDistance);
     }
 }
 
diff --git a/Client/multiplayer_sa/CMultiplayerSA.cpp b/Client/multiplayer_sa/CMultiplayerSA.cpp
@@ -2064,22 +2064,22 @@ void CMultiplayerSA::RestoreFogDistance()
     }
 }
 
-void CMultiplayerSA::SetGrassDrawDistance(float fCloseDistance, float fFarDistance)
+void CMultiplayerSA::SetGrassDrawDistance(float closeDistance, float farDistance)
 {
-    MemPutFast<float>(0xC02DBC, fCloseDistance);
-    MemPutFast<float>(0x8D132C, fFarDistance);
+    MemPutFast<float>(VAR_CGrassCloseDist, closeDistance);
+    MemPutFast<float>(VAR_CGrassFarDist, farDistance);
 }
 
-void CMultiplayerSA::GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance) const
+void CMultiplayerSA::GetGrassDrawDistance(float& closeDistance, float& farDistance) const
 {
-    fCloseDistance = *(float*)0xC02DBC;
-    fFarDistance = *(float*)0x8D132C;
+    closeDistance = *(float*)VAR_CGrassCloseDist;
+    farDistance = *(float*)VAR_CGrassFarDist;
 }
 
 void CMultiplayerSA::ResetGrassDrawDistance()
 {
-    MemPutFast<float>(0xC02DBC, 3.0f);
-    MemPutFast<float>(0x8D132C, 60.0f);
+    MemPutFast<float>(VAR_CGrassCloseDist, DEFAULT_GRASS_CLOSE_DISTANCE);
+    MemPutFast<float>(VAR_CGrassFarDist, DEFAULT_GRASS_FAR_DISTANCE);
 }
 
 void CMultiplayerSA::GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed,
diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h
@@ -21,6 +21,11 @@
 class CRemoteDataSA;
 #define DEFAULT_NEAR_CLIP_DISTANCE  ( 0.3f )
 #define DEFAULT_SHADOWS_OFFSET      ( 0.013f ) // GTA default = 0.06f
+#define DEFAULT_GRASS_CLOSE_DISTANCE ( 3.0f )
+#define DEFAULT_GRASS_FAR_DISTANCE   ( 60.0f )
+
+#define VAR_CGrassCloseDist           0xC02DBC
+#define VAR_CGrassFarDist   0x8D132C
 
 enum eRadioStationID
 {
@@ -192,9 +197,9 @@ void                InitHooks();
     float GetFogDistance();
     void  SetFogDistance(float fDistance);
     void  RestoreFogDistance();
-    void  SetGrassDrawDistance(float fCloseDistance, float fFarDistance);
-    void  GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance) const;
-    void  ResetGrassDrawDistance();
+    void  SetGrassDrawDistance(float closeDistance, float farDistance) override;
+    void  GetGrassDrawDistance(float& closeDistance, float& farDistance) const override;
+    void  ResetGrassDrawDistance() override;
     void  GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed, unsigned char& ucCoronaGreen,
                       unsigned char& ucCoronaBlue);
     void  SetSunColor(unsigned char ucCoreRed, unsigned char ucCoreGreen, unsigned char ucCoreBlue, unsigned char ucCoronaRed, unsigned char ucCoronaGreen,
diff --git a/Client/sdk/multiplayer/CMultiplayer.h b/Client/sdk/multiplayer/CMultiplayer.h
@@ -299,8 +299,8 @@ class CMultiplayer
     virtual void  SetFogDistance(float fDistance) = 0;
     virtual float GetFogDistance() = 0;
     virtual void  RestoreFogDistance() = 0;
-    virtual void  SetGrassDrawDistance(float fCloseDistance, float fFarDistance) = 0;
-    virtual void  GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance) const = 0;
+    virtual void  SetGrassDrawDistance(float closeDistance, float farDistance) = 0;
+    virtual void  GetGrassDrawDistance(float& closeDistance, float& farDistance) const = 0;
     virtual void  ResetGrassDrawDistance() = 0;
     virtual void  GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed,
                               unsigned char& ucCoronaGreen, unsigned char& ucCoronaBlue) = 0;
diff --git a/Server/mods/deathmatch/logic/CGame.h b/Server/mods/deathmatch/logic/CGame.h
@@ -404,18 +404,18 @@ class CGame
     float GetFogDistance() { return m_fFogDistance; }
     void  SetFogDistance(float& fFogDistance) { m_fFogDistance = fFogDistance; }
 
-    bool HasGrassDrawDistance() { return m_bOverrideGrassDrawDistance; }
-    void SetHasGrassDrawDistance(bool bOverrideGrassDrawDistance) { m_bOverrideGrassDrawDistance = bOverrideGrassDrawDistance; }
+    bool HasGrassDrawDistance() const noexcept { return m_bOverrideGrassDrawDistance; }
+    void SetHasGrassDrawDistance(bool bOverrideGrassDrawDistance) noexcept { m_bOverrideGrassDrawDistance = bOverrideGrassDrawDistance; }
 
-    void  GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance)
+    void GetGrassDrawDistance(float& closeDistance, float& farDistance) const noexcept
     {
-        fCloseDistance = m_fGrassCloseDistance;
-        fFarDistance = m_fGrassFarDistance;
+        closeDistance = m_fGrassCloseDistance;
+        farDistance = m_fGrassFarDistance;
     }
-    void SetGrassDrawDistance(float fCloseDistance, float fFarDistance)
+    void SetGrassDrawDistance(float closeDistance, float farDistance) noexcept
     {
-        m_fGrassCloseDistance = fCloseDistance;
-        m_fGrassFarDistance = fFarDistance;
+        m_fGrassCloseDistance = closeDistance;
+        m_fGrassFarDistance = farDistance;
     }
 
     float GetAircraftMaxHeight() { return m_fAircraftMaxHeight; }
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -10686,11 +10686,11 @@ bool CStaticFunctionDefinitions::GetFogDistance(float& fFogDist)
     return false;
 }
 
-bool CStaticFunctionDefinitions::GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance)
+bool CStaticFunctionDefinitions::GetGrassDrawDistance(float& closeDistance, float& farDistance)
 {
     if (g_pGame->HasGrassDrawDistance())
     {
-        g_pGame->GetGrassDrawDistance(fCloseDistance, fFarDistance);
+        g_pGame->GetGrassDrawDistance(closeDistance, farDistance);
         return true;
     }
 
@@ -10881,17 +10881,15 @@ bool CStaticFunctionDefinitions::SetFogDistance(float fFogDist)
     return true;
 }
 
-bool CStaticFunctionDefinitions::SetGrassDrawDistance(float fCloseDistance, float fFarDistance)
+void CStaticFunctionDefinitions::SetGrassDrawDistance(float closeDistance, float farDistance)
 {
-    g_pGame->SetGrassDrawDistance(fCloseDistance, fFarDistance);
+    g_pGame->SetGrassDrawDistance(closeDistance, farDistance);
     g_pGame->SetHasGrassDrawDistance(true);
 
     CBitStream BitStream;
-    BitStream.pBitStream->Write(fCloseDistance);
-    BitStream.pBitStream->Write(fFarDistance);
+    BitStream.pBitStream->Write(closeDistance);
+    BitStream.pBitStream->Write(farDistance);
     m_pPlayerManager->BroadcastOnlyJoined(CLuaPacket(SET_GRASS_DRAW_DISTANCE, *BitStream.pBitStream));
-
-    return true;
 }
 
 bool CStaticFunctionDefinitions::SetAircraftMaxHeight(float fMaxHeight)
@@ -10986,14 +10984,12 @@ bool CStaticFunctionDefinitions::ResetFogDistance()
     return true;
 }
 
-bool CStaticFunctionDefinitions::ResetGrassDrawDistance()
+void CStaticFunctionDefinitions::ResetGrassDrawDistance()
 {
     g_pGame->SetHasGrassDrawDistance(false);
 
     CBitStream BitStream;
     m_pPlayerManager->BroadcastOnlyJoined(CLuaPacket(RESET_GRASS_DRAW_DISTANCE, *BitStream.pBitStream));
-
-    return true;
 }
 
 bool CStaticFunctionDefinitions::RemoveWorldModel(unsigned short usModel, float fRadius, const CVector& vecPosition, char cInterior)
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -605,7 +605,7 @@ class CStaticFunctionDefinitions
     static bool GetWindVelocity(float& fVelX, float& fVelY, float& fVelZ);
     static bool GetFarClipDistance(float& fFarClip);
     static bool GetFogDistance(float& fFogDist);
-    static bool GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance);
+    static bool GetGrassDrawDistance(float& closeDistance, float& farDistance);
     static bool GetAircraftMaxHeight(float& fMaxHeight);
     static bool GetOcclusionsEnabled(bool& bEnabled);
     static bool GetMoonSize(int& iSize);
@@ -645,7 +645,7 @@ class CStaticFunctionDefinitions
     static bool SetWindVelocity(float fVelX, float fVelY, float fVelZ);
     static bool SetFarClipDistance(float fFarClip);
     static bool SetFogDistance(float fFogDist);
-    static bool SetGrassDrawDistance(float fCloseDistance, float fFarDistance);
+    static void SetGrassDrawDistance(float closeDistance, float farDistance);
     static bool SetAircraftMaxHeight(float fMaxHeight);
     static bool SetAircraftMaxVelocity(float fVelocity);
     static bool SetOcclusionsEnabled(bool bEnabled);
@@ -655,7 +655,7 @@ class CStaticFunctionDefinitions
     static bool ResetWindVelocity();
     static bool ResetFarClipDistance();
     static bool ResetFogDistance();
-    static bool ResetGrassDrawDistance();
+    static void ResetGrassDrawDistance();
     static bool RemoveWorldModel(unsigned short usModel, float fRadius, const CVector& vecPosition, char cInterior);
     static bool RestoreWorldModel(unsigned short usModel, float fRadius, const CVector& vecPosition, char cInterior);
     static bool RestoreAllWorldModels();
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp
@@ -802,15 +802,15 @@ int CLuaWorldDefs::getFogDistance(lua_State* luaVM)
     return 1;
 }
 
-std::variant<CLuaMultiReturn<float, float>, bool> CLuaWorldDefs::GetGrassDrawDistance()
+CLuaMultiReturn<float, float> CLuaWorldDefs::GetGrassDrawDistance()
 {
-    float fCloseDistance, fFarDistance;
-    bool  bSuccess = CStaticFunctionDefinitions::GetGrassDrawDistance(fCloseDistance, fFarDistance);
+    float closeDistance, farDistance;
+    bool  bSuccess = CStaticFunctionDefinitions::GetGrassDrawDistance(closeDistance, farDistance);
 
     if (bSuccess)
-        return std::make_tuple(fCloseDistance, fFarDistance);
-    
-    return false;
+        return {closeDistance, farDistance};
+
+    return {};
 }
 
 int CLuaWorldDefs::setInteriorSoundsEnabled(lua_State* luaVM)
@@ -999,9 +999,9 @@ int CLuaWorldDefs::setFogDistance(lua_State* luaVM)
     return 1;
 }
 
-bool CLuaWorldDefs::SetGrassDrawDistance(float closeDistance, float farDistance)
+void CLuaWorldDefs::SetGrassDrawDistance(float closeDistance, float farDistance)
 {
-    return CStaticFunctionDefinitions::SetGrassDrawDistance(closeDistance, farDistance);
+    CStaticFunctionDefinitions::SetGrassDrawDistance(closeDistance, farDistance);
 }
 
 int CLuaWorldDefs::resetRainLevel(lua_State* luaVM)
@@ -1081,9 +1081,9 @@ int CLuaWorldDefs::resetFogDistance(lua_State* luaVM)
     return 1;
 }
 
-bool CLuaWorldDefs::ResetGrassDrawDistance()
+void CLuaWorldDefs::ResetGrassDrawDistance()
 {
-    return CStaticFunctionDefinitions::ResetGrassDrawDistance();
+    CStaticFunctionDefinitions::ResetGrassDrawDistance();
 }
 
 int CLuaWorldDefs::RemoveWorldModel(lua_State* luaVM)
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h
@@ -97,7 +97,7 @@ class CLuaWorldDefs : public CLuaDefs
 
     static void ResetWorldProperties(std::optional<bool> resetSpecialWorldProperties, std::optional<bool> resetWorldProperties, std::optional<bool> resetWeatherProperties, std::optional<bool> resetLODs, std::optional<bool> resetSounds, std::optional<bool> resetGlitches, std::optional<bool> resetJetpackWeapons) noexcept;
 
-    static bool SetGrassDrawDistance(float closeDistance, float farDistance);
-    static std::variant<CLuaMultiReturn<float, float>, bool> GetGrassDrawDistance();
-    static bool ResetGrassDrawDistance();
+    static void SetGrassDrawDistance(float closeDistance, float farDistance);
+    static CLuaMultiReturn<float, float> GetGrassDrawDistance();
+    static void ResetGrassDrawDistance();
 };
diff --git a/Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp b/Server/mods/deathmatch/logic/packets/CMapInfoPacket.cpp
@@ -268,14 +268,6 @@ bool CMapInfoPacket::Write(NetBitStreamInterface& BitStream) const
         BitStream.Write(m_fFogDistance);
     }
 
-    // Grass draw distance
-    BitStream.WriteBit(m_bOverrideGrassDrawDistance);
-    if (m_bOverrideGrassDrawDistance)
-    {
-        BitStream.Write(m_fGrassCloseDistance);
-        BitStream.Write(m_fGrassFarDistance);
-    }
-
     BitStream.Write(m_fAircraftMaxHeight);
     BitStream.Write(m_fAircraftMaxVelocity);
 
@@ -369,5 +361,13 @@ bool CMapInfoPacket::Write(NetBitStreamInterface& BitStream) const
     bool bOcclusionsEnabled = g_pGame->GetOcclusionsEnabled();
     BitStream.WriteBit(bOcclusionsEnabled);
 
+    // Grass draw distance
+    BitStream.WriteBit(m_bOverrideGrassDrawDistance);
+    if (m_bOverrideGrassDrawDistance)
+    {
+        BitStream.Write(m_fGrassCloseDistance);
+        BitStream.Write(m_fGrassFarDistance);
+    }
+
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -1825,21 +1825,19 @@ int CLuaWorldDefs::ResetFogDistance(lua_State* luaVM)`
`1825`	`1825`
`1826`	`1826`	`CLuaMultiReturn<float, float> CLuaWorldDefs::GetGrassDrawDistance()`
`1827`	`1827`	`{`
`1828`		`- float fCloseDistance, fFarDistance;`
`1829`		`- g_pMultiplayer->GetGrassDrawDistance(fCloseDistance, fFarDistance);`
`1830`		`- return {fCloseDistance, fFarDistance};`
	`1828`	`+ float closeDistance, farDistance;`
	`1829`	`+ g_pMultiplayer->GetGrassDrawDistance(closeDistance, farDistance);`
	`1830`	`+ return {closeDistance, farDistance};`
`1831`	`1831`	`}`
`1832`	`1832`
`1833`		`-bool CLuaWorldDefs::SetGrassDrawDistance(float closeDistance, float farDistance)`
	`1833`	`+void CLuaWorldDefs::SetGrassDrawDistance(float closeDistance, float farDistance)`
`1834`	`1834`	`{`
`1835`	`1835`	`g_pMultiplayer->SetGrassDrawDistance(closeDistance, farDistance);`
`1836`		`- return true;`
`1837`	`1836`	`}`
`1838`	`1837`
`1839`		`-bool CLuaWorldDefs::ResetGrassDrawDistance()`
	`1838`	`+void CLuaWorldDefs::ResetGrassDrawDistance()`
`1840`	`1839`	`{`
`1841`	`1840`	`g_pMultiplayer->ResetGrassDrawDistance();`
`1842`		`- return true;`
`1843`	`1841`	`}`
`1844`	`1842`
`1845`	`1843`	`int CLuaWorldDefs::GetSunColor(lua_State* luaVM)`
Original file line number	Diff line number	Diff line change
`@@ -359,11 +359,11 @@ void CWorldRPCs::SetFogDistance(NetBitStreamInterface& bitStream)`
`359`	`359`
`360`	`360`	`void CWorldRPCs::SetGrassDrawDistance(NetBitStreamInterface& bitStream)`
`361`	`361`	`{`
`362`		`- float fCloseDistance, fFarDistance;`
	`362`	`+ float closeDistance, farDistance;`
`363`	`363`
`364`		`- if (bitStream.Read(fCloseDistance) && bitStream.Read(fFarDistance))`
	`364`	`+ if (bitStream.Read(closeDistance) && bitStream.Read(farDistance))`
`365`	`365`	`{`
`366`		`- g_pMultiplayer->SetGrassDrawDistance(fCloseDistance, fFarDistance);`
	`366`	`+ g_pMultiplayer->SetGrassDrawDistance(closeDistance, farDistance);`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`
Original file line number	Diff line number	Diff line change
`@@ -2064,22 +2064,22 @@ void CMultiplayerSA::RestoreFogDistance()`
`2064`	`2064`	`}`
`2065`	`2065`	`}`
`2066`	`2066`
`2067`		`-void CMultiplayerSA::SetGrassDrawDistance(float fCloseDistance, float fFarDistance)`
	`2067`	`+void CMultiplayerSA::SetGrassDrawDistance(float closeDistance, float farDistance)`
`2068`	`2068`	`{`
`2069`		`- MemPutFast<float>(0xC02DBC, fCloseDistance);`
`2070`		`- MemPutFast<float>(0x8D132C, fFarDistance);`
	`2069`	`+ MemPutFast<float>(VAR_CGrassCloseDist, closeDistance);`
	`2070`	`+ MemPutFast<float>(VAR_CGrassFarDist, farDistance);`
`2071`	`2071`	`}`
`2072`	`2072`
`2073`		`-void CMultiplayerSA::GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance) const`
	`2073`	`+void CMultiplayerSA::GetGrassDrawDistance(float& closeDistance, float& farDistance) const`
`2074`	`2074`	`{`
`2075`		`- fCloseDistance = (float)0xC02DBC;`
`2076`		`- fFarDistance = (float)0x8D132C;`
	`2075`	`+ closeDistance = (float)VAR_CGrassCloseDist;`
	`2076`	`+ farDistance = (float)VAR_CGrassFarDist;`
`2077`	`2077`	`}`
`2078`	`2078`
`2079`	`2079`	`void CMultiplayerSA::ResetGrassDrawDistance()`
`2080`	`2080`	`{`
`2081`		`- MemPutFast<float>(0xC02DBC, 3.0f);`
`2082`		`- MemPutFast<float>(0x8D132C, 60.0f);`
	`2081`	`+ MemPutFast<float>(VAR_CGrassCloseDist, DEFAULT_GRASS_CLOSE_DISTANCE);`
	`2082`	`+ MemPutFast<float>(VAR_CGrassFarDist, DEFAULT_GRASS_FAR_DISTANCE);`
`2083`	`2083`	`}`
`2084`	`2084`
`2085`	`2085`	`void CMultiplayerSA::GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed,`
Original file line number	Diff line number	Diff line change
`@@ -404,18 +404,18 @@ class CGame`
`404`	`404`	`float GetFogDistance() { return m_fFogDistance; }`
`405`	`405`	`void SetFogDistance(float& fFogDistance) { m_fFogDistance = fFogDistance; }`
`406`	`406`
`407`		`- bool HasGrassDrawDistance() { return m_bOverrideGrassDrawDistance; }`
`408`		`- void SetHasGrassDrawDistance(bool bOverrideGrassDrawDistance) { m_bOverrideGrassDrawDistance = bOverrideGrassDrawDistance; }`
	`407`	`+ bool HasGrassDrawDistance() const noexcept { return m_bOverrideGrassDrawDistance; }`
	`408`	`+ void SetHasGrassDrawDistance(bool bOverrideGrassDrawDistance) noexcept { m_bOverrideGrassDrawDistance = bOverrideGrassDrawDistance; }`
`409`	`409`
`410`		`- void GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance)`
	`410`	`+ void GetGrassDrawDistance(float& closeDistance, float& farDistance) const noexcept`
`411`	`411`	`{`
`412`		`- fCloseDistance = m_fGrassCloseDistance;`
`413`		`- fFarDistance = m_fGrassFarDistance;`
	`412`	`+ closeDistance = m_fGrassCloseDistance;`
	`413`	`+ farDistance = m_fGrassFarDistance;`
`414`	`414`	`}`
`415`		`- void SetGrassDrawDistance(float fCloseDistance, float fFarDistance)`
	`415`	`+ void SetGrassDrawDistance(float closeDistance, float farDistance) noexcept`
`416`	`416`	`{`
`417`		`- m_fGrassCloseDistance = fCloseDistance;`
`418`		`- m_fGrassFarDistance = fFarDistance;`
	`417`	`+ m_fGrassCloseDistance = closeDistance;`
	`418`	`+ m_fGrassFarDistance = farDistance;`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`float GetAircraftMaxHeight() { return m_fAircraftMaxHeight; }`
Original file line number	Diff line number	Diff line change
`@@ -10686,11 +10686,11 @@ bool CStaticFunctionDefinitions::GetFogDistance(float& fFogDist)`
`10686`	`10686`	`return false;`
`10687`	`10687`	`}`
`10688`	`10688`
`10689`		`-bool CStaticFunctionDefinitions::GetGrassDrawDistance(float& fCloseDistance, float& fFarDistance)`
	`10689`	`+bool CStaticFunctionDefinitions::GetGrassDrawDistance(float& closeDistance, float& farDistance)`
`10690`	`10690`	`{`
`10691`	`10691`	`if (g_pGame->HasGrassDrawDistance())`
`10692`	`10692`	`{`
`10693`		`- g_pGame->GetGrassDrawDistance(fCloseDistance, fFarDistance);`
	`10693`	`+ g_pGame->GetGrassDrawDistance(closeDistance, farDistance);`
`10694`	`10694`	`return true;`
`10695`	`10695`	`}`
`10696`	`10696`
`@@ -10881,17 +10881,15 @@ bool CStaticFunctionDefinitions::SetFogDistance(float fFogDist)`
`10881`	`10881`	`return true;`
`10882`	`10882`	`}`
`10883`	`10883`
`10884`		`-bool CStaticFunctionDefinitions::SetGrassDrawDistance(float fCloseDistance, float fFarDistance)`
	`10884`	`+void CStaticFunctionDefinitions::SetGrassDrawDistance(float closeDistance, float farDistance)`
`10885`	`10885`	`{`
`10886`		`- g_pGame->SetGrassDrawDistance(fCloseDistance, fFarDistance);`
	`10886`	`+ g_pGame->SetGrassDrawDistance(closeDistance, farDistance);`
`10887`	`10887`	`g_pGame->SetHasGrassDrawDistance(true);`
`10888`	`10888`
`10889`	`10889`	`CBitStream BitStream;`
`10890`		`- BitStream.pBitStream->Write(fCloseDistance);`
`10891`		`- BitStream.pBitStream->Write(fFarDistance);`
	`10890`	`+ BitStream.pBitStream->Write(closeDistance);`
	`10891`	`+ BitStream.pBitStream->Write(farDistance);`
`10892`	`10892`	`m_pPlayerManager->BroadcastOnlyJoined(CLuaPacket(SET_GRASS_DRAW_DISTANCE, *BitStream.pBitStream));`
`10893`		`-`
`10894`		`- return true;`
`10895`	`10893`	`}`
`10896`	`10894`
`10897`	`10895`	`bool CStaticFunctionDefinitions::SetAircraftMaxHeight(float fMaxHeight)`
`@@ -10986,14 +10984,12 @@ bool CStaticFunctionDefinitions::ResetFogDistance()`
`10986`	`10984`	`return true;`
`10987`	`10985`	`}`
`10988`	`10986`
`10989`		`-bool CStaticFunctionDefinitions::ResetGrassDrawDistance()`
	`10987`	`+void CStaticFunctionDefinitions::ResetGrassDrawDistance()`
`10990`	`10988`	`{`
`10991`	`10989`	`g_pGame->SetHasGrassDrawDistance(false);`
`10992`	`10990`
`10993`	`10991`	`CBitStream BitStream;`
`10994`	`10992`	`m_pPlayerManager->BroadcastOnlyJoined(CLuaPacket(RESET_GRASS_DRAW_DISTANCE, *BitStream.pBitStream));`
`10995`		`-`
`10996`		`- return true;`
`10997`	`10993`	`}`
`10998`	`10994`
`10999`	`10995`	`bool CStaticFunctionDefinitions::RemoveWorldModel(unsigned short usModel, float fRadius, const CVector& vecPosition, char cInterior)`