diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-12-09 03:15:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 03:15:20 +0300 |
| commit | 6b654094a5299d55a3621a3a23b6dafbb48b78e9 (patch) | |
| tree | e9735ff0ce34dbfca24bf6c4fc609cbacaac81f1 /src/entities/Entity.h | |
| parent | f6cc178a502b276128d52ed976e8dbe53875da8a (diff) | |
| parent | 7e11f639aa468eaf24e51fa04a59fbe966119892 (diff) | |
Merge pull request #871 from withmorten/sized-enums
Get rid of sized enums
Diffstat (limited to 'src/entities/Entity.h')
| -rw-r--r-- | src/entities/Entity.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/entities/Entity.h b/src/entities/Entity.h index ba4f7ab0..9372c85d 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -6,7 +6,7 @@ struct CReference; class CPtrList; -enum eEntityType : uint8 +enum eEntityType { ENTITY_TYPE_NOTHING = 0, ENTITY_TYPE_BUILDING, @@ -16,7 +16,7 @@ enum eEntityType : uint8 ENTITY_TYPE_DUMMY, }; -enum eEntityStatus : uint8 +enum eEntityStatus { STATUS_PLAYER, STATUS_PLAYER_PLAYBACKFROMBUFFER, @@ -92,10 +92,10 @@ public: CReference *m_pFirstReference; public: - eEntityType GetType() const { return (eEntityType)m_type; } - void SetType(eEntityType type) { m_type = type; } - eEntityStatus GetStatus() const { return (eEntityStatus)m_status; } - void SetStatus(eEntityStatus status) { m_status = status; } + uint8 GetType() const { return m_type; } + void SetType(uint8 type) { m_type = type; } + uint8 GetStatus() const { return m_status; } + void SetStatus(uint8 status) { m_status = status; } CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); } bool GetIsStatic(void) const { return bIsStatic; } void SetIsStatic(bool state) { bIsStatic = state; } |