Merge branch 'master' into terencehill/bot_waypoints

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / all.qc

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index b7c65ed960ff6e13eb7696d56c2718db25d7ab47..f118a04667f39c181eb0dee13eede8cc59d42973 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -194,13 +194,8 @@ string W_FixWeaponOrder_ForceComplete(string order)
        return W_FixWeaponOrder(order, 1);
 }
 
-void W_RandomWeapons(entity e, int n)
+WepSet W_RandomWeapons(entity e, WepSet remaining, int n)
 {
-#ifdef SVQC
-       WepSet remaining = STAT(WEAPONS, e);
-#else
-       WepSet remaining = e.weapons;
-#endif
        WepSet result = '0 0 0';
        for (int j = 0; j < n; ++j)
        {
@@ -213,11 +208,7 @@ void W_RandomWeapons(entity e, int n)
                result |= WepSet_FromWeapon(w);
                remaining &= ~WepSet_FromWeapon(w);
        }
-#ifdef SVQC
-       STAT(WEAPONS, e) = result;
-#else
-       e.weapons = result;
-#endif
+       return result;
 }
 
 string GetAmmoPicture(int ammotype)