diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-10-04 21:39:54 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-10-04 21:39:54 +0200 |
| commit | 8c170a62ee5960bcb752630807101efd67d76e00 (patch) | |
| tree | 1f8d60c06806a7dc8a5d398ac4282bf32f9b075f /src/weapons/WeaponInfo.cpp | |
| parent | Merge pull request #738 from erorcun/master (diff) | |
| download | re3-8c170a62ee5960bcb752630807101efd67d76e00.tar re3-8c170a62ee5960bcb752630807101efd67d76e00.tar.gz re3-8c170a62ee5960bcb752630807101efd67d76e00.tar.bz2 re3-8c170a62ee5960bcb752630807101efd67d76e00.tar.lz re3-8c170a62ee5960bcb752630807101efd67d76e00.tar.xz re3-8c170a62ee5960bcb752630807101efd67d76e00.tar.zst re3-8c170a62ee5960bcb752630807101efd67d76e00.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index 93370a18..284a0c20 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -160,17 +160,17 @@ CWeaponInfo::LoadWeaponData(void) ms_apWeaponInfos[weaponType].m_fAnimFrameFire = delayBetweenAnimAndFire / 30.0f; ms_apWeaponInfos[weaponType].m_fAnim2FrameFire = delayBetweenAnim2AndFire / 30.0f; ms_apWeaponInfos[weaponType].m_nModelId = modelId; - 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_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; } } |