BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

assault weapon now reloading correctly

Browse Source
This commit is contained in:
viktorljung
2016-03-13 14:55:29 +01:00
parent 0963f61976
commit 0f4f32188c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
+5 -2
View File
@@ -36,8 +36,11 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
int& magSize = cWeapon["MagazineSize"]; int& magSize = cWeapon["MagazineSize"];
int& ammo = cWeapon["Ammo"]; int& ammo = cWeapon["Ammo"];
ammo = glm::max(0, ammo - (magSize - magAmmo)); int usedAmmo = glm::max(0, magSize - magAmmo);
magAmmo = glm::min(magSize, ammo); magAmmo = glm::clamp(ammo + magAmmo, 0, magSize);
ammo = glm::max(0, ammo - usedAmmo);
isReloading = false; isReloading = false;
if (wi.FirstPersonEntity.Valid()) { if (wi.FirstPersonEntity.Valid()) {
wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = true; wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = true;