summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-10 19:42:04 +0200
committerGitHub <noreply@github.com>2020-05-10 19:42:04 +0200
commit05021ed1e1e5374b38f9ce2912c310c04d358f6d (patch)
treeb9d849f3fc61246f0038e5bec53ef8f61b040b83 /src/entities
parentsome fixes and cosmetic changes (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.tar
re3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.tar.gz
re3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.tar.bz2
re3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.tar.lz
re3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.tar.xz
re3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.tar.zst
re3-05021ed1e1e5374b38f9ce2912c310c04d358f6d.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Building.h4
-rw-r--r--src/entities/Dummy.h4
-rw-r--r--src/entities/Entity.h3
-rw-r--r--src/entities/Physical.h3
-rw-r--r--src/entities/Treadable.h4
5 files changed, 13 insertions, 5 deletions
diff --git a/src/entities/Building.h b/src/entities/Building.h
index 7b837f46..3586a8dc 100644
--- a/src/entities/Building.h
+++ b/src/entities/Building.h
@@ -16,4 +16,6 @@ public:
virtual bool GetIsATreadable(void) { return false; }
};
-static_assert(sizeof(CBuilding) == 0x64, "CBuilding: error");
+
+VALIDATE_SIZE(CBuilding, 0x64);
+
diff --git a/src/entities/Dummy.h b/src/entities/Dummy.h
index fcfd23fb..3717a01c 100644
--- a/src/entities/Dummy.h
+++ b/src/entities/Dummy.h
@@ -15,4 +15,6 @@ public:
static void *operator new(size_t);
static void operator delete(void*, size_t);
};
-static_assert(sizeof(CDummy) == 0x68, "CDummy: error");
+
+VALIDATE_SIZE(CDummy, 0x68);
+
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index 330fde69..eca462cd 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -172,4 +172,5 @@ public:
static void AddSteamsFromGround(CPtrList& list);
};
-static_assert(sizeof(CEntity) == 0x64, "CEntity: error");
+
+VALIDATE_SIZE(CEntity, 0x64);
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index b47d556e..c84686ed 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -160,4 +160,5 @@ public:
bool CheckCollision(void);
bool CheckCollision_SimpleCar(void);
};
-static_assert(sizeof(CPhysical) == 0x128, "CPhysical: error");
+
+VALIDATE_SIZE(CPhysical, 0x128);
diff --git a/src/entities/Treadable.h b/src/entities/Treadable.h
index 9e4de59a..c3160f47 100644
--- a/src/entities/Treadable.h
+++ b/src/entities/Treadable.h
@@ -12,4 +12,6 @@ public:
bool GetIsATreadable(void) { return true; }
};
-static_assert(sizeof(CTreadable) == 0x94, "CTreadable: error");
+
+VALIDATE_SIZE(CTreadable, 0x94);
+