summaryrefslogtreecommitdiffstats
path: root/src/modelinfo/BaseModelInfo.h
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-12-07 00:36:40 +0100
committerwithmorten <morten.with@gmail.com>2020-12-07 00:36:40 +0100
commit4696e3f9c88cdf9e025205b0b525dec8c310b671 (patch)
tree635faa0dc5ff4ce5798dae7a3509042b73c63e46 /src/modelinfo/BaseModelInfo.h
parentfixed parenthesis (diff)
downloadre3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.gz
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.bz2
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.lz
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.xz
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.zst
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.zip
Diffstat (limited to '')
-rw-r--r--src/modelinfo/BaseModelInfo.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 4c274aaf..ae2b6668 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -4,7 +4,7 @@
#define MAX_MODEL_NAME (24)
-enum ModelInfoType : uint8
+enum ModelInfoType
{
MITYPE_NA = 0,
MITYPE_SIMPLE = 1,
@@ -15,7 +15,6 @@ enum ModelInfoType : uint8
MITYPE_PED = 6,
MITYPE_XTRACOMPS = 7,
};
-VALIDATE_SIZE(ModelInfoType, 1);
class C2dEffect;
@@ -28,7 +27,7 @@ protected:
int16 m_objectId;
uint16 m_refCount;
int16 m_txdSlot;
- ModelInfoType m_type;
+ uint8 m_type;
uint8 m_num2dEffects;
bool m_bOwnsColModel;
#ifdef EXTRA_MODEL_FLAGS
@@ -50,7 +49,7 @@ public:
virtual RwObject *GetRwObject(void) = 0;
// one day it becomes virtual
- ModelInfoType GetModelType() const { return m_type; }
+ uint8 GetModelType() const { return m_type; }
bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE ||
m_type == MITYPE_MLO || m_type == MITYPE_XTRACOMPS; // unused but what the heck