X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fselection.qh;h=eea33ddb7b98e71c762a7fc09f9d7f41856c7558;hb=fd1993807d7ada76969f782bd831a2dbc206bca0;hp=071a0fea8bcb73fb1b2ebad279b7d26cbdcf3f83;hpb=f6a5832d12fbcf7fb4f44778063e2c251b9d0a38;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh index 071a0fea8..eea33ddb7 100644 --- a/qcsrc/server/weapons/selection.qh +++ b/qcsrc/server/weapons/selection.qh @@ -1,5 +1,8 @@ #pragma once +#include +#include + // switch between weapons void Send_WeaponComplain(entity e, float wpn, float type); @@ -9,7 +12,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); -#define w_getbestweapon(ent,wepent) Weapons_from(W_GetCycleWeapon(ent, ent.cvar_cl_weaponpriority, 0, -1, false, true, wepent)) +#define w_getbestweapon(ent,wepent) Weapons_from(W_GetCycleWeapon(ent, CS(ent).cvar_cl_weaponpriority, 0, -1, false, true, wepent)) void W_SwitchWeapon_Force(Player this, Weapon w, .entity weaponentity);