CLASS(Blaster, Weapon)
/* spawnfunc */ ATTRIB(Blaster, m_canonical_spawnfunc, string, "weapon_blaster");
-/* ammotype */ //ATTRIB(Blaster, ammo_type, int, RESOURCE_NONE);
+/* ammotype */ //ATTRIB(Blaster, ammo_type, int, RES_NONE);
/* impulse */ ATTRIB(Blaster, impulse, int, 1);
/* flags */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
/* rating */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0);
CLASS(OffhandBlaster, OffhandWeapon)
ENDCLASS(OffhandBlaster)
-OffhandBlaster OFFHAND_BLASTER; STATIC_INIT(OFFHAND_BLASTER) { OFFHAND_BLASTER = NEW(OffhandBlaster); }
+OffhandBlaster OFFHAND_BLASTER;
+STATIC_INIT(OFFHAND_BLASTER) { OFFHAND_BLASTER = NEW(OffhandBlaster); }
#ifdef SVQC
.float blaster_damage;
.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, \
WEP_CVAR_SEC(weapon_name, spread), \
WEP_CVAR_SEC(weapon_name, delay), \
WEP_CVAR_SEC(weapon_name, lifetime) \
- ); \
- actor.(weaponentity).m_weapon = oldwep;
+ );
#endif