archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-22 13:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

checked some of streaming for VC changes

Browse Source
This commit is contained in:
aap
2020-05-06 21:54:43 +02:00
parent 03cecb6f1c
commit 965ea93a61
8 changed files with 120 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/modelinfo/BaseModelInfo.h
View File

@ -6,14 +6,16 @@
enum ModelInfoType : uint8
{
MITYPE_NA = 0,
MITYPE_SIMPLE = 1,
MITYPE_MLO = 2,
MITYPE_TIME = 3,
MITYPE_CLUMP = 4,
MITYPE_VEHICLE = 5,
MITYPE_PED = 6,
MITYPE_XTRACOMPS = 7,
MITYPE_NA,
MITYPE_SIMPLE,
MITYPE_MLO, // unused but still in enum
MITYPE_TIME,
MITYPE_WEAPON,
MITYPE_CLUMP,
MITYPE_VEHICLE,
MITYPE_PED,
MITYPE_XTRACOMPS, // unused but still in enum
MITYPE_HAND // xbox and mobile
};
static_assert(sizeof(ModelInfoType) == 1, "ModeInfoType: error");
@ -43,10 +45,9 @@ public:
// one day it becomes virtual
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
}
bool IsBuilding(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME || m_type == MITYPE_WEAPON; }
bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE; }
char *GetName(void) { return m_name; }
void SetName(const char *name) { strncpy(m_name, name, 24); }
void SetColModel(CColModel *col, bool owns = false){

4
src/modelinfo/ModelIndices.h
View File

@ -357,7 +357,7 @@ enum
MI_AIRTRAIN_VLO = 198,
MI_LOPOLYGUY,
NUM_DEFAULT_MODELS
NUM_DEFAULT_MODELS = 300 // MIAMI
};
enum{
@ -373,7 +373,7 @@ inline bool
IsGlass(int16 id)
{
CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
return mi->IsSimple() && (mi->m_isCodeGlass || mi->m_isArtistGlass);
return mi->IsBuilding() && (mi->m_isCodeGlass || mi->m_isArtistGlass);
}
inline bool