Skip to content

Add a new spawnflag to point_viewcontrol to toggle invulnerability of the viewer #1637

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add a new spawnflag to point_viewcontrol to toggle invulnerability of the viewer #1637

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a6694a
Add a new spawnflag to point_viewcontrol to toggle invulnerability of…
WereTech Nov 8, 2025
a641e57
invert spawnflag check for backwards compatibility
WereTech Nov 10, 2025
a9f18f7
adjust Disable to only set m_takedamage when the invuln spawnflag is …
WereTech Nov 10, 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
9 changes: 6 additions & 3 deletions src/game/server/triggers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2844,6 +2844,7 @@ void CAI_ChangeHintGroup::InputActivate( inputdata_t &inputdata )
#define SF_CAMERA_PLAYER_SNAP_TO 16
#define SF_CAMERA_PLAYER_NOT_SOLID 32
#define SF_CAMERA_PLAYER_INTERRUPT 64
#define SF_CAMERA_PLAYER_INVULN 128


//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -3095,10 +3096,12 @@ void CTriggerCamera::Enable( void )

m_nPlayerButtons = pPlayer->m_nButtons;


// Make the player invulnerable while under control of the camera. This will prevent situations where the player dies while under camera control but cannot restart their game due to disabled player inputs.
m_nOldTakeDamage = m_hPlayer->m_takedamage;
m_hPlayer->m_takedamage = DAMAGE_NO;
if ( HasSpawnFlags( SF_CAMERA_PLAYER_INVULN ) )
Copy link
Contributor

@ficool2 ficool2 Nov 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This condition needs to be inverted for backwards compatibility (and rename the flag accodingly). The previous behavior should exist for old maps.
It also shouldn't revert the m_takeDamage when Disabling in this case

Copy link
Author

@WereTech WereTech Nov 10, 2025

Choose a reason for hiding this comment

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

Made the changes

{
// Make the player invulnerable while under control of the camera. This will prevent situations where the player dies while under camera control but cannot restart their game due to disabled player inputs.
m_hPlayer->m_takedamage = DAMAGE_NO;
}

if ( HasSpawnFlags( SF_CAMERA_PLAYER_NOT_SOLID ) )
{
Expand Down