diff options
author | erorcun <erayorcunus@gmail.com> | 2020-10-08 15:15:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-08 15:15:55 +0200 |
commit | bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242 (patch) | |
tree | 1f5e271c7f3447686fb8b9e5715e9fba14bc19c2 /src/weapons/WeaponInfo.cpp | |
parent | little renamings & librw update (diff) | |
parent | Fix some sanitizer errors, improve POSIX streamer (diff) | |
download | re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.tar re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.tar.gz re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.tar.bz2 re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.tar.lz re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.tar.xz re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.tar.zst re3-bf98dcbc3a19bd80fefe0c4cd2a1cb975e678242.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; } } |