From: terencehill <piuntn@gmail.com>
Date: Tue, 9 Aug 2022 13:02:22 +0000 (+0200)
Subject: Reloadable shotgun: fix broken automatic switch to best weapon when out of ammo
X-Git-Tag: xonotic-v0.8.6~357^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e10a8008e2757e671301b38bdc6f81a26ceb637;p=xonotic%2Fxonotic-data.pk3dir.git

Reloadable shotgun: fix broken automatic switch to best weapon when out of ammo
---

diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc
index e43aa89aa..403299caa 100644
--- a/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@ -212,7 +212,8 @@ METHOD(Shotgun, wr_think, void(entity thiswep, entity actor, .entity weaponentit
             return;
         }
     }
-    else
+
+    if(actor.(weaponentity).clip_load >= 0) // we are not currently reloading
     {
         if(fire & 1)
         {