Add a new spawnflag to point_viewcontrol to toggle invulnerability of the viewer #1637
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ficool2
reviewed
Nov 10, 2025
src/game/server/triggers.cpp
Outdated
| // 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 ) ) |
Contributor
There was a problem hiding this comment.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will allow creators to decide whether or not the player is allowed to take damage while using a point_viewcontrol. However, this still creates the issue of the player's current view entity not being reset by default and needs an explicit call for Disable or resetting the view entity back to the player. If pulled in conjunction with my other pull request at #1634, this handling can be done a bit better as it removes the IsAlive check from the Disable function so it could be disabled immediately on death instead of needing to wait until the player has respawned (if they are allowed to).