Merge branch 'master' into pending-release

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / blaster.qh

diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh
index d768abfafe46ada390d6f4dfea6c4b3558c3c961..944e86405d595f3882532c0e887ef419e1b308c0 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qh
+++ b/qcsrc/common/weapons/weapon/blaster.qh
@@ -18,6 +18,7 @@ CLASS(Blaster, Weapon)
 /* wepimg    */ ATTRIB(Blaster, model2, string, "weaponlaser");
 /* refname   */ ATTRIB(Blaster, netname, string, "blaster");
 /* wepname   */ ATTRIB(Blaster, m_name, string, _("Blaster"));
+/* legacy    */ ATTRIB(Blaster, m_deprecated_netname, string, "laser");
 
 #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
@@ -54,32 +55,3 @@ CLASS(OffhandBlaster, OffhandWeapon)
 ENDCLASS(OffhandBlaster)
 OffhandBlaster OFFHAND_BLASTER;
 STATIC_INIT(OFFHAND_BLASTER) { OFFHAND_BLASTER = NEW(OffhandBlaster); }
-
-#ifdef SVQC
-.float blaster_damage;
-.float blaster_edgedamage;
-.float blaster_radius;
-.float blaster_force;
-.float blaster_force_zscale;
-.float blaster_lifetime;
-
-// Will be demacroed after WEP_CVAR macros are also demacroed.
-#define BLASTER_SECONDARY_ATTACK(weapon_name, actor, weaponentity) \
-       makevectors(actor.v_angle); \
-       W_Blaster_Attack( \
-               actor, \
-               weaponentity, \
-               WEP_BLASTER.m_id | HITTYPE_SECONDARY, \
-               WEP_CVAR_SEC(weapon_name, shotangle), \
-               WEP_CVAR_SEC(weapon_name, damage), \
-               WEP_CVAR_SEC(weapon_name, edgedamage), \
-               WEP_CVAR_SEC(weapon_name, radius), \
-               WEP_CVAR_SEC(weapon_name, force), \
-               WEP_CVAR_SEC(weapon_name, force_zscale), \
-               WEP_CVAR_SEC(weapon_name, speed), \
-               WEP_CVAR_SEC(weapon_name, spread), \
-               WEP_CVAR_SEC(weapon_name, delay), \
-               WEP_CVAR_SEC(weapon_name, lifetime) \
-       );
-
-#endif