Merge branch 'master' into Mario/wepent_experimental

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / selection.qh

diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh
index 68c15139ea7dee762d87bf8a593f377f8c70d118..071a0fea8bcb73fb1b2ebad279b7d26cbdcf3f83 100644 (file)
--- a/qcsrc/server/weapons/selection.qh
+++ b/qcsrc/server/weapons/selection.qh
@@ -9,8 +9,7 @@ bool client_hasweapon(entity this, Weapon wpn, .entity weaponentity, float andam
 .int weaponcomplainindex;
 float W_GetCycleWeapon(entity this, string weaponorder, float dir, float imp, float complain, float skipmissing, .entity weaponentity);
 
-// TODO: unhardcode
-#define w_getbestweapon(ent) Weapons_from(W_GetCycleWeapon(ent, ent.cvar_cl_weaponpriority, 0, -1, false, true, weaponentities[0]))
+#define w_getbestweapon(ent,wepent) Weapons_from(W_GetCycleWeapon(ent, ent.cvar_cl_weaponpriority, 0, -1, false, true, wepent))
 
 void W_SwitchWeapon_Force(Player this, Weapon w, .entity weaponentity);