From c798e1bacdaabaf140ff3904948fd7cec46c09bb Mon Sep 17 00:00:00 2001
From: bigbossbro08 <bigbossbro08@gmail.com>
Date: Sun, 10 May 2020 21:49:33 +0600
Subject: Fixed typos and made all assert functions optional

---
 src/animation/AnimBlendAssociation.h | 4 +---
 src/animation/AnimBlendClumpData.h   | 4 ++--
 src/animation/AnimBlendHierarchy.h   | 4 +---
 src/animation/AnimBlendNode.h        | 5 ++---
 src/animation/AnimBlendSequence.h    | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/animation')

diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h
index 4f3be016..d0c60a88 100644
--- a/src/animation/AnimBlendAssociation.h
+++ b/src/animation/AnimBlendAssociation.h
@@ -85,6 +85,4 @@ public:
 	}
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CAnimBlendAssociation) == 0x40, "CAnimBlendAssociation: error");
-#endif
\ No newline at end of file
+VALIDATE_SIZE(CAnimBlendAssociation, 0x40);
diff --git a/src/animation/AnimBlendClumpData.h b/src/animation/AnimBlendClumpData.h
index a537425a..5c511ab8 100644
--- a/src/animation/AnimBlendClumpData.h
+++ b/src/animation/AnimBlendClumpData.h
@@ -26,7 +26,7 @@ struct AnimBlendFrameData
 #endif
 };
 #ifndef PED_SKIN
-static_assert(sizeof(AnimBlendFrameData) == 0x14, "AnimBlendFrameData: error");
+VALIDATE_SIZE(AnimBlendFrameData, 0x14);
 #endif
 
 
@@ -51,5 +51,5 @@ public:
 	void ForAllFrames(void (*cb)(AnimBlendFrameData*, void*), void *arg);
 };
 #ifndef PED_SKIN
-static_assert(sizeof(CAnimBlendClumpData) == 0x14, "CAnimBlendClumpData: error");
+VALIDATE_SIZE(CAnimBlendClumpData, 0x14);
 #endif
diff --git a/src/animation/AnimBlendHierarchy.h b/src/animation/AnimBlendHierarchy.h
index 1bf687cc..0144108d 100644
--- a/src/animation/AnimBlendHierarchy.h
+++ b/src/animation/AnimBlendHierarchy.h
@@ -25,6 +25,4 @@ public:
 	void RemoveUncompressedData(void);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CAnimBlendHierarchy) == 0x28, "CAnimBlendHierarchy: error");
-#endif
\ No newline at end of file
+VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
\ No newline at end of file
diff --git a/src/animation/AnimBlendNode.h b/src/animation/AnimBlendNode.h
index 46f2fee4..89924d6a 100644
--- a/src/animation/AnimBlendNode.h
+++ b/src/animation/AnimBlendNode.h
@@ -27,6 +27,5 @@ public:
 	void GetEndTranslation(CVector &trans, float weight);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CAnimBlendNode) == 0x1C, "CAnimBlendNode: error");
-#endif
\ No newline at end of file
+
+VALIDATE_SIZE(CAnimBlendNode, 0x1C);
diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h
index 1246d7b4..44ac8886 100644
--- a/src/animation/AnimBlendSequence.h
+++ b/src/animation/AnimBlendSequence.h
@@ -51,5 +51,5 @@ public:
 #endif
 };
 #ifndef PED_SKIN
-static_assert(sizeof(CAnimBlendSequence) == 0x2C, "CAnimBlendSequence: error");
+VALIDATE_SIZE(CAnimBlendSequence, 0x2C);
 #endif
-- 
cgit v1.2.3