get rid of all direct use of weapon sets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 5d086820e24cde732d54f8876845c67e78fa27bb..ef3b45aec54095bd5f050655671c11d8e099b5e1 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -103,7 +103,7 @@ void UpdateFrags(entity player, float f)
 void W_SwitchWeapon_Force(entity e, float w);
 void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 {
-       float w;
+       WEPSET_DECLARE_A(w);
 
        // TODO route through PlayerScores instead
        if(gameover) return;
@@ -160,8 +160,8 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
                        WEPSET_ANDNOT_AW(w, culprit);
 
                        // among the remaining ones, choose one by random
-                       w = randombits(w, 1, FALSE);
-                       if(w)
+                       _WS_w = randombits(_WS_w, 1, FALSE); // FIXME
+                       if(!WEPSET_EMPTY_A(w))
                        {
                                WEPSET_OR_EA(attacker, w);
                                WEPSET_ANDNOT_EW(attacker, culprit);