summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-15 16:30:25 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-15 20:21:25 +0200
commitacd1ea9909da281acea6af8f0775e456a67d4a4a (patch)
tree414a38371f5157b403b03ed3c02e1680c99af166 /src/modelinfo
parentFix compilation (diff)
downloadre3-acd1ea9909da281acea6af8f0775e456a67d4a4a.tar
re3-acd1ea9909da281acea6af8f0775e456a67d4a4a.tar.gz
re3-acd1ea9909da281acea6af8f0775e456a67d4a4a.tar.bz2
re3-acd1ea9909da281acea6af8f0775e456a67d4a4a.tar.lz
re3-acd1ea9909da281acea6af8f0775e456a67d4a4a.tar.xz
re3-acd1ea9909da281acea6af8f0775e456a67d4a4a.tar.zst
re3-acd1ea9909da281acea6af8f0775e456a67d4a4a.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/ModelIndices.h29
-rw-r--r--src/modelinfo/SimpleModelInfo.h3
-rw-r--r--src/modelinfo/WeaponModelInfo.h4
3 files changed, 19 insertions, 17 deletions
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 7d3524d6..a21da7d3 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -387,20 +387,21 @@ enum
MI_TRAIN = -1,
MI_DODO = -2,
- MI_GRENADE = 258,
- MI_AK47,
- MI_BASEBALL_BAT,
- MI_COLT,
- MI_MOLOTOV,
- MI_ROCKETLAUNCHER,
- MI_SHOTGUN,
- MI_SNIPER,
- MI_UZI,
- MI_MISSILE,
- MI_M16,
- MI_FLAMETHROWER,
- MI_BOMB,
- MI_FINGERS,
+ MI_BASEBALL_BAT = 264,
+ MI_GRENADE = 270,
+ MI_MOLOTOV = 272,
+ MI_MISSILE = 273,
+ MI_COLT = 274,
+ MI_AK47 = 276,
+ MI_SHOTGUN = 279,
+ MI_M16 = 280,
+ MI_UZI = 282,
+ MI_MP5 = 284,
+ MI_SNIPER = 285,
+ MI_ROCKETLAUNCHER = 287,
+ MI_FLAMETHROWER = 288,
+ MI_BOMB = 291,
+ MI_FINGERS = 293,
MI_CUTOBJ01 = 295,
MI_CUTOBJ02,
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h
index 55d6149c..986cb886 100644
--- a/src/modelinfo/SimpleModelInfo.h
+++ b/src/modelinfo/SimpleModelInfo.h
@@ -39,9 +39,10 @@ public:
RwObject *CreateInstance(RwMatrix *);
RwObject *GetRwObject(void) { return (RwObject*)m_atomics[0]; }
+ virtual void SetAtomic(int n, RpAtomic *atomic);
+
void Init(void);
void IncreaseAlpha(void);
- void SetAtomic(int n, RpAtomic *atomic);
void SetLodDistances(float *dist);
float GetLodDistance(int i);
float GetNearDistance(void);
diff --git a/src/modelinfo/WeaponModelInfo.h b/src/modelinfo/WeaponModelInfo.h
index 17e717db..5c690c29 100644
--- a/src/modelinfo/WeaponModelInfo.h
+++ b/src/modelinfo/WeaponModelInfo.h
@@ -14,9 +14,9 @@ public:
virtual void SetAnimFile(const char *file);
virtual void ConvertAnimFileIndex(void);
virtual int GetAnimFileIndex(void) { return m_animFileIndex; }
-
+ virtual void SetAtomic(int n, RpAtomic *atomic);
+
void Init(void);
void SetWeaponInfo(int32 weaponId);
int32 GetWeaponInfo(void);
- void SetAtomic(int n, RpAtomic *atomic);
};