summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-12-07 01:59:17 +0100
committerwithmorten <morten.with@gmail.com>2020-12-07 01:59:17 +0100
commit4c0744260d2a7c1d9e015359edc58affb975fa03 (patch)
tree2d32e1f4658266e39c65937c1197c7277f51a487 /src/modelinfo
parentint8 enums fixed (diff)
downloadre3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.gz
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.bz2
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.lz
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.xz
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.zst
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/BaseModelInfo.h7
-rw-r--r--src/modelinfo/VehicleModelInfo.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index e7dd9e4b..3aa0857a 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -4,7 +4,7 @@
#define MAX_MODEL_NAME (21)
-enum ModelInfoType : uint8
+enum ModelInfoType
{
MITYPE_NA,
MITYPE_SIMPLE,
@@ -17,7 +17,6 @@ enum ModelInfoType : uint8
MITYPE_XTRACOMPS, // unused but still in enum
MITYPE_HAND // xbox and mobile
};
-VALIDATE_SIZE(ModelInfoType, 1);
class C2dEffect;
@@ -25,7 +24,7 @@ class CBaseModelInfo
{
protected:
char m_name[MAX_MODEL_NAME];
- ModelInfoType m_type;
+ uint8 m_type;
uint8 m_num2dEffects;
bool m_bOwnsColModel;
CColModel *m_colModel;
@@ -47,7 +46,7 @@ public:
virtual int GetAnimFileIndex(void) { return -1; }
// one day it becomes virtual
- ModelInfoType GetModelType() const { return m_type; }
+ uint8 GetModelType() const { return m_type; }
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; }
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index d03ab9bf..c7a41126 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -24,7 +24,7 @@ enum {
ATOMIC_FLAG_NOCULL = 0x800,
};
-enum eVehicleType : uint8{
+enum eVehicleType {
VEHICLE_TYPE_CAR,
VEHICLE_TYPE_BOAT,
VEHICLE_TYPE_TRAIN,