Skip to content

Commit 1b25b76

Browse files
authored
Merge pull request ReactiveDrop#1065 from anf3is/revert-1063-fix/healguns-reload
Revert "Prevent reload of heal and amp ammo of various healguns"
2 parents 3a3d5fe + 45e3529 commit 1b25b76

3 files changed

Lines changed: 1 addition & 3 deletions

File tree

src/game/shared/swarm/asw_weapon_heal_gun_shared.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class CASW_Weapon_Heal_Gun : public CASW_Weapon, public IASW_Medical_Weapon
5252
virtual void HealAttack() { PrimaryAttack(); }
5353
virtual bool HasMedicalAmmo() { return HasPrimaryAmmo(); }
5454
virtual bool SecondaryAttackUsesPrimaryAmmo() { return true; }
55-
virtual bool UsesClipsForAmmo1() const override { return false; }
5655
virtual bool Reload( void );
5756
virtual bool HasAmmo();
5857
virtual void WeaponIdle( void );

src/game/shared/swarm/asw_weapon_healamp_gun_shared.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CASW_Weapon_HealAmp_Gun : public CASW_Weapon_Heal_Gun
2424

2525
virtual Class_T Classify( void ) { return (Class_T)CLASS_ASW_HEALAMP_GUN; }
2626
virtual bool SecondaryAttackUsesPrimaryAmmo() { return false; }
27-
virtual bool UsesClipsForAmmo2() const override { return false; }
27+
virtual bool UsesClipsForAmmo2() { return false; }
2828

2929
#ifdef CLIENT_DLL
3030
virtual void MouseOverEntity(C_BaseEntity *pEnt, Vector vecWorldCursor);

src/game/shared/swarm/asw_weapon_medrifle_shared.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class CASW_Weapon_MedRifle : public CASW_Weapon_Rifle, public IASW_Medical_Weapo
3939
virtual void SecondaryAttack();
4040
virtual void HealAttack() { SecondaryAttack(); }
4141
virtual bool HasMedicalAmmo() { return HasSecondaryAmmo(); }
42-
virtual bool UsesClipsForAmmo2() const override { return false; }
4342
virtual void WeaponIdle( void );
4443
virtual const Vector& GetBulletSpread( void );
4544
virtual void ItemPostFrame();

0 commit comments

Comments
 (0)