Merge branch 'master' into Lyberta/OffhandBlaster

[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 9d28e73772dd3405046d24ad5f7dcebae4ba0209..7efbdf7a52cc661899ce42c973c72c11df5959df 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qh
+++ b/qcsrc/common/weapons/weapon/blaster.qh
@@ -59,10 +59,9 @@ OffhandBlaster OFFHAND_BLASTER; STATIC_INIT(OFFHAND_BLASTER) { OFFHAND_BLASTER =
 .float blaster_force;
 .float blaster_lifetime;
 
-#define BLASTER_SECONDARY_ATTACK_HACK(weapon_name, actor, weaponentity) \
+// Will be demacroed after WEP_CVAR macros are also demacroed.
+#define BLASTER_SECONDARY_ATTACK(weapon_name, actor, weaponentity) \
        makevectors(actor.v_angle); \
-       Weapon oldwep = actor.(weaponentity).m_weapon; \
-       actor.(weaponentity).m_weapon = WEP_BLASTER; \
        W_Blaster_Attack( \
                actor, \
                weaponentity, \
@@ -76,7 +75,6 @@ OffhandBlaster OFFHAND_BLASTER; STATIC_INIT(OFFHAND_BLASTER) { OFFHAND_BLASTER =
                WEP_CVAR_SEC(weapon_name, spread), \
                WEP_CVAR_SEC(weapon_name, delay), \
                WEP_CVAR_SEC(weapon_name, lifetime) \
-       ); \
-       actor.(weaponentity).m_weapon = oldwep;
+       );
 
 #endif