X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=1208766e21a99fca98117786b7391e0cb312d6f4;hb=d7b327f92ccc87d235ee8ba026e7054a8e2e83fe;hp=3b69e13eb0942f30b1e394a3a7b0813ae6e3cce7;hpb=b7ee5fd9f465455a5691abba80a7e83a1ab5b2d8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 3b69e13eb..1208766e2 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -853,7 +853,7 @@ void weapon_setup(float windex) entity e; e = get_weaponinfo(windex); self.items &~= IT_AMMO; - self.items = self.items | e.items; + self.items = self.items | (e.items & IT_AMMO); // the two weapon entities will notice this has changed and update their models self.weapon = windex;