5 files changed, 8 insertions, 15 deletions
diff --git a/src/entities/Building.h b/src/entities/Building.h
index 50818189..3586a8dc 100644
--- a/src/entities/Building.h
+++ b/src/entities/Building.h
@@ -17,6 +17,5 @@ public:
 	virtual bool GetIsATreadable(void) { return false; }
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CBuilding) == 0x64, "CBuilding: error");
-#endif
+VALIDATE_SIZE(CBuilding, 0x64);
+
diff --git a/src/entities/Dummy.h b/src/entities/Dummy.h
index de0e448b..3717a01c 100644
--- a/src/entities/Dummy.h
+++ b/src/entities/Dummy.h
@@ -16,6 +16,5 @@ public:
 	static void operator delete(void*, size_t);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CDummy) == 0x68, "CDummy: error");
-#endif
+VALIDATE_SIZE(CDummy, 0x68);
+
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index 18254ae4..eca462cd 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -173,6 +173,4 @@ public:
 	static void AddSteamsFromGround(CPtrList& list);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CEntity) == 0x64, "CEntity: error");
-#endif
-\ No newline at end of file
+VALIDATE_SIZE(CEntity, 0x64);
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index c9b7402b..c84686ed 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -161,6 +161,4 @@ public:
 	bool CheckCollision_SimpleCar(void);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CPhysical) == 0x128, "CPhysical: error");
-#endif
+VALIDATE_SIZE(CPhysical, 0x128);
diff --git a/src/entities/Treadable.h b/src/entities/Treadable.h
index 272b2d4b..c3160f47 100644
--- a/src/entities/Treadable.h
+++ b/src/entities/Treadable.h
@@ -13,6 +13,5 @@ public:
 	bool GetIsATreadable(void) { return true; }
 };
 
-#ifdef CHECK_STRUCT_SIZES
-static_assert(sizeof(CTreadable) == 0x94, "CTreadable: error");
-#endif
+VALIDATE_SIZE(CTreadable, 0x94);
+