sync with upstream

7 files changed, 22 insertions, 6 deletions

diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
index a24a3f4f..2a71a8d5 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -89,4 +89,5 @@ public:
 		}
 	}
 };
-static_assert(sizeof(C2dEffect) == 0x34, "C2dEffect: error");
+
+VALIDATE_SIZE(C2dEffect, 0x34);
diff --git a/src/render/Coronas.h b/src/render/Coronas.h
index 4b49e40e..46eb4315 100644
--- a/src/render/Coronas.h
+++ b/src/render/Coronas.h
@@ -38,7 +38,8 @@ struct CRegisteredCorona
 
 	void Update(void);
 };
-static_assert(sizeof(CRegisteredCorona) == 0x80, "CRegisteredCorona: error");
+
+VALIDATE_SIZE(CRegisteredCorona, 0x80);
 
 class CCoronas
 {
diff --git a/src/render/Particle.h b/src/render/Particle.h
index b71dc717..7f02e318 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -91,4 +91,4 @@ public:
 	static void AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatrix);
 };
 
-VALIDATE_SIZE(CParticle, 0x68);
\ No newline at end of file
+VALIDATE_SIZE(CParticle, 0x68);
diff --git a/src/render/ParticleMgr.h b/src/render/ParticleMgr.h
index 70845a56..42e3f132 100644
--- a/src/render/ParticleMgr.h
+++ b/src/render/ParticleMgr.h
@@ -64,8 +64,10 @@ struct tParticleSystemData
 	RwRaster      **m_ppRaster;
 	CParticle     *m_pParticles;
 };
-VALIDATE_SIZE(tParticleSystemData, 0x88);
 
+#ifdef CHECK_STRUCT_SIZES
+VALIDATE_SIZE(tParticleSystemData, 0x88);
+#endif
 
 class cParticleSystemMgr
 {
@@ -125,6 +127,8 @@ public:
 	void RangeCheck(tParticleSystemData *pData) { }
 };
 
+#ifdef CHECK_STRUCT_SIZES
 VALIDATE_SIZE(cParticleSystemMgr, 0x2420);
+#endif
 
 extern cParticleSystemMgr mod_ParticleSystemManager;
\ No newline at end of file
diff --git a/src/render/PointLights.h b/src/render/PointLights.h
index 56b84f71..9e94328f 100644
--- a/src/render/PointLights.h
+++ b/src/render/PointLights.h
@@ -13,7 +13,7 @@ public:
 	int8 fogType;
 	bool castExtraShadows;
 };
-static_assert(sizeof(CRegisteredPointLight) == 0x2C, "CRegisteredPointLight: error");
+VALIDATE_SIZE(CRegisteredPointLight, 0x2C);
 
 class CPointLights
 {
diff --git a/src/render/Shadows.h b/src/render/Shadows.h
index 39be343e..ef56d336 100644
--- a/src/render/Shadows.h
+++ b/src/render/Shadows.h
@@ -51,7 +51,10 @@ public:
     CStoredShadow()
 	{  }
 };
+
+#ifdef CHECK_STRUCT_SIZES
 VALIDATE_SIZE(CStoredShadow, 0x30);
+#endif
 
 class CPolyBunch
 {
@@ -65,7 +68,10 @@ public:
     CPolyBunch()
 	{  }
 };
+
+#ifdef CHECK_STRUCT_SIZES
 VALIDATE_SIZE(CPolyBunch, 0x6C);
+#endif
 
 class CStaticShadow
 {
@@ -93,7 +99,10 @@ public:
 
 	void Free();
 };
+
+#ifdef CHECK_STRUCT_SIZES
 VALIDATE_SIZE(CStaticShadow, 0x40);
+#endif
 
 class CPermanentShadow
 {
@@ -115,6 +124,7 @@ public:
 	CPermanentShadow()
 	{  }
 };
+
 VALIDATE_SIZE(CPermanentShadow, 0x38);
 
 class CPtrList;
diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h
index d2d20863..a37bdd12 100644
--- a/src/render/WaterCannon.h
+++ b/src/render/WaterCannon.h
@@ -25,7 +25,7 @@ public:
 	void PushPeds(void);
 };
 
-static_assert(sizeof(CWaterCannon) == 412, "CWaterCannon: error");
+VALIDATE_SIZE(CWaterCannon, 412);
 
 class CWaterCannons
 {