Skip to content

Prevent reload of heal and amp ammo of various healguns #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 1 commit into from
May 19, 2026
Merged

Prevent reload of heal and amp ammo of various healguns #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/game/shared/swarm/asw_weapon_heal_gun_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class CASW_Weapon_Heal_Gun : public CASW_Weapon, public IASW_Medical_Weapon
virtual void HealAttack() { PrimaryAttack(); }
virtual bool HasMedicalAmmo() { return HasPrimaryAmmo(); }
virtual bool SecondaryAttackUsesPrimaryAmmo() { return true; }
virtual bool UsesClipsForAmmo1() const override { return false; }
virtual bool Reload( void );
virtual bool HasAmmo();
virtual void WeaponIdle( void );
Expand Down
2 changes: 1 addition & 1 deletion src/game/shared/swarm/asw_weapon_healamp_gun_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CASW_Weapon_HealAmp_Gun : public CASW_Weapon_Heal_Gun

virtual Class_T Classify( void ) { return (Class_T)CLASS_ASW_HEALAMP_GUN; }
virtual bool SecondaryAttackUsesPrimaryAmmo() { return false; }
virtual bool UsesClipsForAmmo2() { return false; }
virtual bool UsesClipsForAmmo2() const override { return false; }

@BenLubar BenLubar May 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this also have UsesClipsForAmmo1?

@anf3is anf3is May 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UsesClipsForAmmo1 is inherited from heal gun.
But I can add this to healamp gun too for clarity.

@BenLubar BenLubar May 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I forgot about the crazy weapon class tree.


#ifdef CLIENT_DLL
virtual void MouseOverEntity(C_BaseEntity *pEnt, Vector vecWorldCursor);
Expand Down
1 change: 1 addition & 0 deletions src/game/shared/swarm/asw_weapon_medrifle_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class CASW_Weapon_MedRifle : public CASW_Weapon_Rifle, public IASW_Medical_Weapo
virtual void SecondaryAttack();
virtual void HealAttack() { SecondaryAttack(); }
virtual bool HasMedicalAmmo() { return HasSecondaryAmmo(); }
virtual bool UsesClipsForAmmo2() const override { return false; }
virtual void WeaponIdle( void );
virtual const Vector& GetBulletSpread( void );
virtual void ItemPostFrame();
Expand Down
Loading