Skip to content

Fix player_speedmod Enable/Disable inputs not respecting spawnflag to prevent flashlight suppression #502

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
Blixibon wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix player_speedmod Enable/Disable inputs not respecting spawnflag to prevent flashlight suppression #502

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
26 changes: 17 additions & 9 deletions sp/src/game/server/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8620,15 +8620,19 @@ void CMovementSpeedMod::InputEnable(inputdata_t &data)

pPlayer->HideViewModels();
}

// Turn off the flashlight
if ( pPlayer->FlashlightIsOn() )

if ( !HasSpawnFlags( SF_SPEED_MOD_DONT_SUPPRESS_FLASHLIGHT ) )
{
pPlayer->FlashlightTurnOff();
}
// Turn off the flashlight
if ( pPlayer->FlashlightIsOn() )
{
pPlayer->FlashlightTurnOff();
}

// Disable the flashlight's further use
pPlayer->SetFlashlightEnabled( false );
// Disable the flashlight's further use
pPlayer->SetFlashlightEnabled( false );
}

pPlayer->DisableButtons( GetDisabledButtonMask() );

// Hide the HUD
Expand Down Expand Up @@ -8663,9 +8667,13 @@ void CMovementSpeedMod::InputDisable(inputdata_t &data)
pPlayer->GetActiveWeapon()->Deploy();
}
}

if ( !HasSpawnFlags( SF_SPEED_MOD_DONT_SUPPRESS_FLASHLIGHT ) )
{
// Allow the flashlight again
pPlayer->SetFlashlightEnabled( true );
}

// Allow the flashlight again
pPlayer->SetFlashlightEnabled( true );
pPlayer->EnableButtons( GetDisabledButtonMask() );

// Restore the HUD
Expand Down