diff options
author | aap <aap@papnet.eu> | 2020-05-05 13:02:42 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-05 13:02:42 +0200 |
commit | b44df26d3ea5fcdaf6d954016303f358d2c64b79 (patch) | |
tree | 2921c2c0e2883117f4ce9cec73865c1701f32cec /src/modelinfo/BaseModelInfo.h | |
parent | SetPosition, final part (diff) | |
download | re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.gz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.bz2 re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.lz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.xz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.zst re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.zip |
Diffstat (limited to '')
-rw-r--r-- | src/modelinfo/BaseModelInfo.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h index 0c4bf934..44f4c47a 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; @@ -30,11 +30,11 @@ protected: public: uint16 m_refCount; int16 m_txdSlot; - ModeInfoType m_type; + ModelInfoType m_type; uint8 m_num2dEffects; - bool m_freeCol; + bool m_bOwnsColModel; - CBaseModelInfo(ModeInfoType type); + CBaseModelInfo(ModelInfoType type); virtual ~CBaseModelInfo() {} virtual void Shutdown(void); virtual void DeleteRwObject(void) = 0; @@ -48,8 +48,8 @@ public: } char *GetName(void) { return m_name; } void SetName(const char *name) { strncpy(m_name, name, 24); } - void SetColModel(CColModel *col, bool free = false){ - m_colModel = col; m_freeCol = free; } + void SetColModel(CColModel *col, bool owns = false){ + m_colModel = col; m_bOwnsColModel = owns; } CColModel *GetColModel(void) { return m_colModel; } void DeleteCollisionModel(void); void ClearTexDictionary(void) { m_txdSlot = -1; } |