assault weapon now reloading correctly

2016-03-13 14:55:29 +01:00
parent 0963f61976
commit 0f4f32188c
1 changed files with 5 additions and 2 deletions
@@ -36,8 +36,11 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
        int& magSize = cWeapon["MagazineSize"];
        int& ammo = cWeapon["Ammo"];

-        ammo = glm::max(0, ammo - (magSize - magAmmo));
-        magAmmo = glm::min(magSize, ammo);
+        int usedAmmo = glm::max(0, magSize - magAmmo);
+        magAmmo = glm::clamp(ammo + magAmmo, 0, magSize);
+        ammo = glm::max(0, ammo - usedAmmo);
+        
+        
        isReloading = false;
        if (wi.FirstPersonEntity.Valid()) {
            wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = true;