Skip to content

Add client convar for weapon auto-aim toggle #1045

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 10, 2026
Merged

Add client convar for weapon auto-aim toggle #1045

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
2 changes: 2 additions & 0 deletions src/game/client/swarm/c_asw_weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ ConVar rd_drop_magazine_spin( "rd_drop_magazine_spin", "1000", FCVAR_NONE, "Amou
ConVar rd_drop_magazine_lifetime( "rd_drop_magazine_lifetime", "4", FCVAR_NONE, "Time before a dropped magazine fades" );
ConVar rd_strange_device_model( "rd_strange_device_model", "0", FCVAR_NONE, "Should items with strange devices attached display them in the world?" );

ConVar rd_autoaim_weapons("rd_autoaim_weapons", "1", FCVAR_NONE, "Enable auto-aim bonus for selected weapons (autogun, prifle)");

extern ConVar asw_use_particle_tracers;
extern ConVar muzzleflash_light;
extern ConVar rd_show_others_laser_pointer;
Expand Down
2 changes: 2 additions & 0 deletions src/game/client/swarm/c_asw_weapon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class C_BreakableProp;
class CASW_EquipItem;
class C_RD_Weapon_Accessory;

extern ConVar rd_autoaim_weapons;

extern ConVar rd_ground_shooting;

class C_ASW_Weapon : public C_BaseCombatWeapon, public IASW_Client_Usable_Entity
Expand Down
4 changes: 4 additions & 0 deletions src/game/shared/swarm/asw_weapon_autogun_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ class CASW_Weapon_Autogun : public CASW_Weapon_Rifle
//float GetFireRate( void ) { return 0.1f; }

virtual const float GetAutoAimAmount() { return 0.36f; }
#ifdef CLIENT_DLL
virtual const float GetAutoAimRadiusScale() { return rd_autoaim_weapons.GetBool() ? 1.5f : 1.0f; }
#else
virtual const float GetAutoAimRadiusScale() { return 1.5f; }
#endif // CLIENT_DLL
virtual bool ShouldFlareAutoaim() { return true; }
virtual const Vector& GetBulletSpread( void );

Expand Down
4 changes: 4 additions & 0 deletions src/game/shared/swarm/asw_weapon_prifle_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class CASW_Weapon_PRifle : public CASW_Weapon_Rifle
void Precache();

virtual const float GetAutoAimAmount() { return 0.26f; }
#ifdef CLIENT_DLL
virtual const float GetAutoAimRadiusScale() { return rd_autoaim_weapons.GetBool() ? 1.5f : 1.0f; }
#else
virtual const float GetAutoAimRadiusScale() { return 1.5f; }
#endif // CLIENT_DLL
virtual float GetFireRate();
virtual float GetWeaponBaseDamageOverride();
virtual int GetWeaponSkillId();
Expand Down
Loading