Crash fix (plane was sometimes working, sometimes not - instant crash)

Author: Xenius97

Client/game_sa/CFxSA.cpp

@@ -16,10 +16,10 @@
 #include "CFxSA.h"
 #include "CEntitySA.h"
 ;
-using StoreShadowToBeRendered_t = int(__cdecl*)(eShadowType, struct RwTexture*, const CVector*, float, float, float, float, short, unsigned char, unsigned char,
+using StoreShadowToBeRendered_t = int(__cdecl*)(eShadowType, RwTexture*, const CVector*, float, float, float, float, short, unsigned char, unsigned char,
                                                 unsigned char, float, bool, float, class CRealTimeShadow*, bool);
-auto            StoreShadowToBeRendered = reinterpret_cast<StoreShadowToBeRendered_t>(0x707390);
-unsigned short& CShadows_ShadowsStoredToBeRendered = *(unsigned short*)0xC403DC;
+inline auto            StoreShadowToBeRendered = reinterpret_cast<StoreShadowToBeRendered_t>(FUNC_FXSystem_StoreShadows);
+inline unsigned short& CShadows_ShadowsStoredToBeRendered = *(unsigned short*)VAR_FXSystem_StoreShadows;
 
 void CFxSA::AddBlood(CVector& vecPosition, CVector& vecDirection, int iCount, float fBrightness)
 {
@@ -340,19 +340,22 @@ void CFxSA::AddParticle(FxParticleSystems eFxParticle, const CVector& vecPositio
 
 bool CFxSA::IsShadowsLimitReached()
 {
-    constexpr int shadowsLimit = 48;
-    return CShadows_ShadowsStoredToBeRendered >= shadowsLimit;
+    // GTA:SA can handle max 48 shadows per frame
+    return CShadows_ShadowsStoredToBeRendered >= 48;
 }
 
 bool CFxSA::AddShadow(eShadowTextureType shadowTextureType, const CVector& vecPosition, const CVector2D& vecOffset1, const CVector2D& vecOffset2, SColor color,
                       eShadowType shadowType, float fZDistance, bool bDrawOnWater, bool bDrawOnBuildings)
 {
-    if (IsShadowsLimitReached())
+    // Check if we can add more shadows this frame
+    if (IsShadowsLimitReached() || shadowTextureType >= eShadowTextureType::COUNT)
         return false;
 
-    void*      textureAddress = *(void**)(FUNC_FXSystem_BaseShadow + (int)shadowTextureType * 4);
+    // Get the RwTexture for the shadow
+    void*      textureAddress = *(void**)(TEXTURE_FXSystem_Shadow + (int)shadowTextureType * 4);
     RwTexture* pRwTexture = reinterpret_cast<RwTexture*>(textureAddress);
 
+    // Store the shadow to be rendered
     return StoreShadowToBeRendered(shadowType, pRwTexture, &vecPosition, vecOffset1.fX, vecOffset1.fY, vecOffset2.fX, vecOffset2.fY, color.A, color.R, color.G,
                                    color.B, fZDistance, bDrawOnWater, 1, 0, bDrawOnBuildings);
 }

Client/game_sa/CFxSA.h

@@ -32,7 +32,9 @@ class FxSystem_c;
 #define FUNC_CFx_TriggerBulletSplash       0x4a10e0
 #define FUNC_CFx_TriggerFootSplash         0x4a1150
 #define FUNC_FXSystem_c_AddParticle        0x4AA440
-#define FUNC_FXSystem_BaseShadow           0xC403E0
+#define FUNC_FXSystem_StoreShadows         0x707390
+#define VAR_FXSystem_StoreShadows          0xC403DC
+#define TEXTURE_FXSystem_Shadow            0xC403E0
 class CFxSAInterface
 {
 public:

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -861,7 +861,6 @@ ADD_ENUM(_D3DFORMAT::D3DFMT_A32B32G32R32F, "a32b32g32r32f")
 IMPLEMENT_ENUM_CLASS_END("surface-format")
 
 IMPLEMENT_ENUM_CLASS_BEGIN(eShadowTextureType)
-ADD_ENUM(eShadowTextureType::PLANE, "plane")
 ADD_ENUM(eShadowTextureType::CAR, "car")
 ADD_ENUM(eShadowTextureType::PED, "ped")
 ADD_ENUM(eShadowTextureType::HELI, "heli")

Client/sdk/game/CFx.h

@@ -21,8 +21,6 @@ struct RwColor;
 
 enum class eShadowTextureType
 {
-    // use only color instead of texture
-    PLANE = -1,
     CAR,
     PED,
     HELI,
@@ -35,6 +33,7 @@ enum class eShadowTextureType
     HANDMAN,
     WINCRACK,
     LAMP,
+    COUNT
 };
 
 enum class eShadowType