merge request #40 from 10010101001/patch-1

fix weapon fire animation playing while overheating
project-imprimis · Aug 1, 2021 · 3327d4d · 3327d4d
2 parents abc4e5c + 7468d17
commit 3327d4d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/game/weapon.cpp b/game/weapon.cpp
@@ -243,20 +243,20 @@ namespace game
             if(name[0])
             {
                 int gun = getweapon(name);
-                if(validgun(gun) && gun != player1->gunselect && player1->ammo[gun])
+                if(validgun(gun) && gun != player1->gunselect && player1->ammo[gun] && weaponallowed(gun))
                 {
                     gunselect(gun, player1);
                     return;
                 }
             }
             else
             {
-                weaponswitch(player1);
                 return;
             }
         }
     });
 
+
     void offsetray(const vec &from, const vec &to, int spread, float range, vec &dest)
     {
         vec offset;
@@ -1001,12 +1001,12 @@ namespace game
         int gun = d->gunselect,
             act = d->attacking,
             atk = guns[gun].attacks[act];
-        d->lastaction = lastmillis;
-        d->lastattack = atk;
         if(d->heat[gun] > attacks[atk].maxheat) // check if weapon has overheated
         {
             return;
         }
+        d->lastaction = lastmillis;
+        d->lastattack = atk;
         if(!d->ammo[gun])
         {
             if(d==player1)