a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-22 23:00:01 +00:00
Code Issues Projects Releases Wiki Activity

ModeInfoType -> ModelInfoType

Browse source
This commit is contained in:
Sergeanur 2020-05-05 15:13:09 +03:00
parent 4cc1bb92e7
commit 5580eb21a4
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modelinfo/BaseModelInfo.cpp
View file

@ -6,7 +6,7 @@
#include "BaseModelInfo.h" #include "BaseModelInfo.h"
CBaseModelInfo::CBaseModelInfo(ModeInfoType type) CBaseModelInfo::CBaseModelInfo(ModelInfoType type)
{ {
m_colModel = nil; m_colModel = nil;
m_twodEffects = nil; m_twodEffects = nil;

10
src/modelinfo/BaseModelInfo.h
View file

@ -4,7 +4,7 @@
#define MAX_MODEL_NAME (24) #define MAX_MODEL_NAME (24)
enum ModeInfoType : uint8 enum ModelInfoType : uint8
{ {
MITYPE_NA = 0, MITYPE_NA = 0,
MITYPE_SIMPLE = 1, MITYPE_SIMPLE = 1,
@ -15,7 +15,7 @@ enum ModeInfoType : uint8
MITYPE_PED = 6, MITYPE_PED = 6,
MITYPE_XTRACOMPS = 7, MITYPE_XTRACOMPS = 7,
}; };
static_assert(sizeof(ModeInfoType) == 1, "ModeInfoType: error"); static_assert(sizeof(ModelInfoType) == 1, "ModeInfoType: error");
class C2dEffect; class C2dEffect;
@ -28,12 +28,12 @@ protected:
int16 m_objectId; int16 m_objectId;
uint16 m_refCount; uint16 m_refCount;
int16 m_txdSlot; int16 m_txdSlot;
ModeInfoType m_type; ModelInfoType m_type;
uint8 m_num2dEffects; uint8 m_num2dEffects;
bool m_freeCol; bool m_freeCol;
public: public:
CBaseModelInfo(ModeInfoType type); CBaseModelInfo(ModelInfoType type);
virtual ~CBaseModelInfo() {} virtual ~CBaseModelInfo() {}
virtual void Shutdown(void); virtual void Shutdown(void);
virtual void DeleteRwObject(void) = 0; virtual void DeleteRwObject(void) = 0;
@ -42,7 +42,7 @@ public:
virtual RwObject *GetRwObject(void) = 0; virtual RwObject *GetRwObject(void) = 0;
// one day it becomes virtual // 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 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 || 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 m_type == MITYPE_MLO || m_type == MITYPE_XTRACOMPS; // unused but what the heck

2
src/modelinfo/ClumpModelInfo.h
View file

@ -32,7 +32,7 @@ public:
RpClump *m_clump; RpClump *m_clump;
CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) {} CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) {}
CClumpModelInfo(ModeInfoType id) : CBaseModelInfo(id) {} CClumpModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
~CClumpModelInfo() {} ~CClumpModelInfo() {}
void DeleteRwObject(void); void DeleteRwObject(void);
RwObject *CreateInstance(void); RwObject *CreateInstance(void);

2
src/modelinfo/SimpleModelInfo.h
View file

@ -25,7 +25,7 @@ public:
uint16 m_noZwrite : 1; uint16 m_noZwrite : 1;
CSimpleModelInfo(void) : CBaseModelInfo(MITYPE_SIMPLE) {} CSimpleModelInfo(void) : CBaseModelInfo(MITYPE_SIMPLE) {}
CSimpleModelInfo(ModeInfoType id) : CBaseModelInfo(id) {} CSimpleModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
~CSimpleModelInfo() {} ~CSimpleModelInfo() {}
void DeleteRwObject(void); void DeleteRwObject(void);
RwObject *CreateInstance(void); RwObject *CreateInstance(void);