diff options
| author | aap <aap@papnet.eu> | 2019-07-07 21:09:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 21:09:40 +0200 |
| commit | 6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3 (patch) | |
| tree | 726feb5b5fdc365ffdaa44208380e738d69ad2ff /src/weapons/WeaponInfo.cpp | |
| parent | Merge pull request #120 from ShFil119/audio4 (diff) | |
| parent | Darkel is bored. (diff) | |
| download | re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.gz re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.bz2 re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.lz re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.xz re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.zst re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.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); } |