diff options
| author | _AG <gennariarmando@outlook.com> | 2019-07-04 22:31:21 +0200 |
|---|---|---|
| committer | _AG <gennariarmando@outlook.com> | 2019-07-04 22:33:19 +0200 |
| commit | 9fed0c040c482bac8cba688e7564c8e8dfe23b30 (patch) | |
| tree | 6098d16b702a3a057cd0bbd39bf3ece217c832c8 /src/weapons/WeaponInfo.cpp | |
| parent | Merge pull request #110 from erorcun/erorcun (diff) | |
| download | re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.gz re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.bz2 re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.lz re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.xz re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.zst re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index 5be18c3c..6884d347 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -6,7 +6,7 @@ #include "AnimBlendAssociation.h" //CWeaponInfo (&CWeaponInfo::ms_apWeaponInfos)[14] = * (CWeaponInfo(*)[14]) * (uintptr*)0x6503EC; -CWeaponInfo CWeaponInfo::ms_apWeaponInfos[NUM_WEAPONTYPES]; +CWeaponInfo CWeaponInfo::ms_apWeaponInfos[WEAPONTYPE_TOTALWEAPONS]; static char ms_aWeaponNames[][32] = { "Unarmed", @@ -34,7 +34,7 @@ void CWeaponInfo::Initialise(void) { debug("Initialising CWeaponInfo...\n"); - for (int i = 0; i < NUM_WEAPONTYPES; i++) { + for (int i = 0; i < WEAPONTYPE_TOTALWEAPONS; i++) { ms_apWeaponInfos[i].m_eWeaponFire = WEAPON_FIRE_INSTANT_HIT; ms_apWeaponInfos[i].m_AnimToPlay = ANIM_PUNCH_R; ms_apWeaponInfos[i].m_Anim2ToPlay = NUM_ANIMS; @@ -176,7 +176,7 @@ CWeaponInfo::LoadWeaponData(void) eWeaponType CWeaponInfo::FindWeaponType(char *name) { - for (int i = 0; i < NUM_WEAPONTYPES; i++) { + for (int i = 0; i < WEAPONTYPE_TOTALWEAPONS; i++) { if (strcmp(ms_aWeaponNames[i], name) == 0) { return static_cast<eWeaponType>(i); } |