diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-12-09 01:15:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 01:15:20 +0100 |
| commit | 6b654094a5299d55a3621a3a23b6dafbb48b78e9 (patch) | |
| tree | e9735ff0ce34dbfca24bf6c4fc609cbacaac81f1 /src/modelinfo/BaseModelInfo.h | |
| parent | fix CObject::DeleteAllTempObjectsInArea (diff) | |
| parent | don't cast script param to uint8 (diff) | |
| download | re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.gz re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.bz2 re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.lz re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.xz re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.zst re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.zip | |
Diffstat (limited to 'src/modelinfo/BaseModelInfo.h')
| -rw-r--r-- | src/modelinfo/BaseModelInfo.h | 7 |
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 |