diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-12 12:42:57 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-12 12:42:57 +0200 |
| commit | 417646819c5d88bb7774bbb0341d92ada3293196 (patch) | |
| tree | 4da51aa3be7f75002b16985207d9411d900dde7d /src/weapons | |
| parent | mark file and fix screen offset (diff) | |
| parent | Merge pull request #753 from majesticCoding/miami (diff) | |
| download | re3-417646819c5d88bb7774bbb0341d92ada3293196.tar re3-417646819c5d88bb7774bbb0341d92ada3293196.tar.gz re3-417646819c5d88bb7774bbb0341d92ada3293196.tar.bz2 re3-417646819c5d88bb7774bbb0341d92ada3293196.tar.lz re3-417646819c5d88bb7774bbb0341d92ada3293196.tar.xz re3-417646819c5d88bb7774bbb0341d92ada3293196.tar.zst re3-417646819c5d88bb7774bbb0341d92ada3293196.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index 6debf725..b911805d 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -249,28 +249,28 @@ CWeaponInfo::LoadWeaponData(void) ms_apWeaponInfos[weaponType].m_nModelId = modelId; ms_apWeaponInfos[weaponType].m_nModel2Id = modelId2; - ms_apWeaponInfos[weaponType].m_bUseGravity = flags; - ms_apWeaponInfos[weaponType].m_bSlowsDown = flags >> 1; - ms_apWeaponInfos[weaponType].m_bDissipates = flags >> 2; - ms_apWeaponInfos[weaponType].m_bRandSpeed = flags >> 3; - ms_apWeaponInfos[weaponType].m_bExpands = flags >> 4; - ms_apWeaponInfos[weaponType].m_bExplodes = flags >> 5; - ms_apWeaponInfos[weaponType].m_bCanAim = flags >> 6; - ms_apWeaponInfos[weaponType].m_bCanAimWithArm = flags >> 7; - ms_apWeaponInfos[weaponType].m_b1stPerson = flags >> 8; - ms_apWeaponInfos[weaponType].m_bHeavy = flags >> 9; - ms_apWeaponInfos[weaponType].m_bThrow = flags >> 10; - ms_apWeaponInfos[weaponType].m_bReloadLoop2Start = flags >> 11; - ms_apWeaponInfos[weaponType].m_bUse2nd = flags >> 12; - ms_apWeaponInfos[weaponType].m_bGround2nd = flags >> 13; - ms_apWeaponInfos[weaponType].m_bFinish3rd = flags >> 14; - ms_apWeaponInfos[weaponType].m_bReload = flags >> 15; - ms_apWeaponInfos[weaponType].m_bFightMode = flags >> 16; - ms_apWeaponInfos[weaponType].m_bCrouchFire = flags >> 17; - ms_apWeaponInfos[weaponType].m_bCop3rd = flags >> 18; - ms_apWeaponInfos[weaponType].m_bGround3rd = flags >> 19; - ms_apWeaponInfos[weaponType].m_bPartialAttack = flags >> 20; - ms_apWeaponInfos[weaponType].m_bAnimDetonate = flags >> 21; + ms_apWeaponInfos[weaponType].m_bUseGravity = flags & 1; + ms_apWeaponInfos[weaponType].m_bSlowsDown = (flags >> 1) & 1; + ms_apWeaponInfos[weaponType].m_bDissipates = (flags >> 2) & 1; + ms_apWeaponInfos[weaponType].m_bRandSpeed = (flags >> 3) & 1; + ms_apWeaponInfos[weaponType].m_bExpands = (flags >> 4) & 1; + ms_apWeaponInfos[weaponType].m_bExplodes = (flags >> 5) & 1; + ms_apWeaponInfos[weaponType].m_bCanAim = (flags >> 6) & 1; + ms_apWeaponInfos[weaponType].m_bCanAimWithArm = (flags >> 7) & 1; + ms_apWeaponInfos[weaponType].m_b1stPerson = (flags >> 8) & 1; + ms_apWeaponInfos[weaponType].m_bHeavy = (flags >> 9) & 1; + ms_apWeaponInfos[weaponType].m_bThrow = (flags >> 10) & 1; + ms_apWeaponInfos[weaponType].m_bReloadLoop2Start = (flags >> 11) & 1; + ms_apWeaponInfos[weaponType].m_bUse2nd = (flags >> 12) & 1; + ms_apWeaponInfos[weaponType].m_bGround2nd = (flags >> 13) & 1; + ms_apWeaponInfos[weaponType].m_bFinish3rd = (flags >> 14) & 1; + ms_apWeaponInfos[weaponType].m_bReload = (flags >> 15) & 1; + ms_apWeaponInfos[weaponType].m_bFightMode = (flags >> 16) & 1; + ms_apWeaponInfos[weaponType].m_bCrouchFire = (flags >> 17) & 1; + ms_apWeaponInfos[weaponType].m_bCop3rd = (flags >> 18) & 1; + ms_apWeaponInfos[weaponType].m_bGround3rd = (flags >> 19) & 1; + ms_apWeaponInfos[weaponType].m_bPartialAttack = (flags >> 20) & 1; + ms_apWeaponInfos[weaponType].m_bAnimDetonate = (flags >> 21) & 1; ms_apWeaponInfos[weaponType].m_nWeaponSlot = weaponSlot; |