diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 14:13:09 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 14:13:09 +0200 |
| commit | 5580eb21a4801677234733df232ec280b62c7ce2 (patch) | |
| tree | 90e703f92f1c73d80e4940688b6c38fd66ab7fb1 /src/modelinfo/BaseModelInfo.h | |
| parent | Make CBaseModelInfo fields protected (diff) | |
| download | re3-5580eb21a4801677234733df232ec280b62c7ce2.tar re3-5580eb21a4801677234733df232ec280b62c7ce2.tar.gz re3-5580eb21a4801677234733df232ec280b62c7ce2.tar.bz2 re3-5580eb21a4801677234733df232ec280b62c7ce2.tar.lz re3-5580eb21a4801677234733df232ec280b62c7ce2.tar.xz re3-5580eb21a4801677234733df232ec280b62c7ce2.tar.zst re3-5580eb21a4801677234733df232ec280b62c7ce2.zip | |
Diffstat (limited to 'src/modelinfo/BaseModelInfo.h')
| -rw-r--r-- | src/modelinfo/BaseModelInfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h index f767e0e7..061ebee6 100644 --- a/src/modelinfo/BaseModelInfo.h +++ b/src/modelinfo/BaseModelInfo.h @@ -4,7 +4,7 @@ #define MAX_MODEL_NAME (24) -enum ModeInfoType : uint8 +enum ModelInfoType : uint8 { MITYPE_NA = 0, MITYPE_SIMPLE = 1, @@ -15,7 +15,7 @@ enum ModeInfoType : uint8 MITYPE_PED = 6, MITYPE_XTRACOMPS = 7, }; -static_assert(sizeof(ModeInfoType) == 1, "ModeInfoType: error"); +static_assert(sizeof(ModelInfoType) == 1, "ModeInfoType: error"); class C2dEffect; @@ -28,12 +28,12 @@ protected: int16 m_objectId; uint16 m_refCount; int16 m_txdSlot; - ModeInfoType m_type; + ModelInfoType m_type; uint8 m_num2dEffects; bool m_freeCol; public: - CBaseModelInfo(ModeInfoType type); + CBaseModelInfo(ModelInfoType type); virtual ~CBaseModelInfo() {} virtual void Shutdown(void); virtual void DeleteRwObject(void) = 0; @@ -42,7 +42,7 @@ public: virtual RwObject *GetRwObject(void) = 0; // one day it becomes virtual - ModeInfoType GetModelType() const { return m_type; } + ModelInfoType 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 |