summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-05 14:13:09 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-05 14:13:09 +0200
commit5580eb21a4801677234733df232ec280b62c7ce2 (patch)
tree90e703f92f1c73d80e4940688b6c38fd66ab7fb1
parentMake CBaseModelInfo fields protected (diff)
downloadre3-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 '')
-rw-r--r--src/modelinfo/BaseModelInfo.cpp2
-rw-r--r--src/modelinfo/BaseModelInfo.h10
-rw-r--r--src/modelinfo/ClumpModelInfo.h2
-rw-r--r--src/modelinfo/SimpleModelInfo.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/modelinfo/BaseModelInfo.cpp b/src/modelinfo/BaseModelInfo.cpp
index e8d2601f..ed1928af 100644
--- a/src/modelinfo/BaseModelInfo.cpp
+++ b/src/modelinfo/BaseModelInfo.cpp
@@ -6,7 +6,7 @@
#include "BaseModelInfo.h"
-CBaseModelInfo::CBaseModelInfo(ModeInfoType type)
+CBaseModelInfo::CBaseModelInfo(ModelInfoType type)
{
m_colModel = nil;
m_twodEffects = nil;
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
diff --git a/src/modelinfo/ClumpModelInfo.h b/src/modelinfo/ClumpModelInfo.h
index 100aa30b..c37a468a 100644
--- a/src/modelinfo/ClumpModelInfo.h
+++ b/src/modelinfo/ClumpModelInfo.h
@@ -32,7 +32,7 @@ public:
RpClump *m_clump;
CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) {}
- CClumpModelInfo(ModeInfoType id) : CBaseModelInfo(id) {}
+ CClumpModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
~CClumpModelInfo() {}
void DeleteRwObject(void);
RwObject *CreateInstance(void);
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h
index 35d48669..4435732c 100644
--- a/src/modelinfo/SimpleModelInfo.h
+++ b/src/modelinfo/SimpleModelInfo.h
@@ -25,7 +25,7 @@ public:
uint16 m_noZwrite : 1;
CSimpleModelInfo(void) : CBaseModelInfo(MITYPE_SIMPLE) {}
- CSimpleModelInfo(ModeInfoType id) : CBaseModelInfo(id) {}
+ CSimpleModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
~CSimpleModelInfo() {}
void DeleteRwObject(void);
RwObject *CreateInstance(void);