X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon.qh;h=ccb71154e5b3dd95d7d7a162dff8784b12880d68;hb=c2d50c76c59b481a0b0e29a205f5e0dfc9f95630;hp=a0f9dd48a743fec4ea591d19f899c953fab281fd;hpb=85d1187251eae197d44f2b39a4a0e6fe96b56f9d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index a0f9dd48a..ccb71154e 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -51,11 +51,6 @@ const int WS_READY = 4; /** fields which are explicitly/manually set are marked with "M", fields set automatically are marked with "A" */ CLASS(Weapon, Object) ATTRIB(Weapon, m_id, int, 0) - /** - * M: WEP_id : WEP_... - * you can recognize dummies when this == 0 - */ - ATTRIB(Weapon, weapon, int, 0); /** A: WEPSET_id : WEPSET_... */ ATTRIB(Weapon, weapons, WepSet, '0 0 0'); /** M: ammotype : main ammo field */ @@ -216,9 +211,4 @@ int GetAmmoStat(.int ammotype); string W_Sound(string w_snd); string W_Model(string w_mdl); - -// other useful macros -#define WEP_AMMO(wpn) (WEP_##wpn.ammo_field) // only used inside weapon files/with direct name, don't duplicate prefix -#define WEP_NAME(wpn) ((Weapons_from(wpn)).m_name) - #endif