Skip to content

Prevent the rocket launcher laser from switching when holding the RMB #269

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

Open
beefy24 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Prevent the rocket launcher laser from switching when holding the RMB #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee4f4a2
Add ItemPostFrame() and laser switch readiness flag to CRpg
beefy24 Nov 19, 2025
37f9073
Enhance laser activation for CRpg weapon
beefy24 Nov 19, 2025
9c1581e
Rename laser switch readiness variable
beefy24 Nov 20, 2025
57d6852
Rename laser switch readiness variable
beefy24 Nov 20, 2025
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
16 changes: 16 additions & 0 deletions dlls/rpg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,8 @@ bool CRpg::GetItemInfo(ItemInfo* p)

bool CRpg::Deploy()
{
m_fLaserSwitchReady = true;

if (m_iClip == 0)
{
return DefaultDeploy("models/v_rpg.mdl", "models/p_rpg.mdl", RPG_DRAW_UL, "rpg");
Expand Down Expand Up @@ -506,6 +508,12 @@ void CRpg::PrimaryAttack()

void CRpg::SecondaryAttack()
{
// switch the laser only once per a key press (not while holding).
if (!m_fLaserSwitchReady)
return;

m_fLaserSwitchReady = false;

m_fSpotActive = !m_fSpotActive;

#ifndef CLIENT_DLL
Expand All @@ -520,6 +528,14 @@ void CRpg::SecondaryAttack()
}


void CRpg::ItemPostFrame()
{
m_fLaserSwitchReady |= (m_pPlayer->pev->button & IN_ATTACK2) == 0;

CBasePlayerWeapon::ItemPostFrame();
}


void CRpg::WeaponIdle()
{
UpdateSpot();
Expand Down
2 changes: 2 additions & 0 deletions dlls/weapons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,12 +796,14 @@ class CRpg : public CBasePlayerWeapon
void PrimaryAttack() override;
void SecondaryAttack() override;
void WeaponIdle() override;
void ItemPostFrame() override;

void UpdateSpot();
bool ShouldWeaponIdle() override { return true; }

CLaserSpot* m_pSpot;
bool m_fSpotActive;
bool m_fLaserSwitchReady;
int m_cActiveRockets; // how many missiles in flight from this launcher right now?

bool UseDecrement() override
Expand Down