Skip to content

Fix spec_goto old crash #202

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
merged 1 commit into from
Feb 20, 2023
Merged

Fix spec_goto old crash #202

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
20 changes: 16 additions & 4 deletions game/server/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2607,10 +2607,22 @@ void CBasePlayer::ObserverUse( bool bIsPressed )

void CBasePlayer::JumptoPosition(const Vector &origin, const QAngle &angles)
{
SetAbsOrigin( origin );
SetAbsVelocity( vec3_origin ); // stop movement
SetLocalAngles( angles );
SnapEyeAngles( angles );
Vector neworigin;
QAngle newangles;

// Clamp the position and angles to prevent crashes
neworigin.x = clamp( origin.x, MIN_COORD_FLOAT, MAX_COORD_FLOAT );
neworigin.y = clamp( origin.y, MIN_COORD_FLOAT, MAX_COORD_FLOAT );
neworigin.z = clamp( origin.z, MIN_COORD_FLOAT, MAX_COORD_FLOAT );

newangles.x = clamp( newangles.x, MIN_COORD_FLOAT, MAX_COORD_FLOAT );
newangles.y = clamp( newangles.y, MIN_COORD_FLOAT, MAX_COORD_FLOAT );
newangles.z = clamp( newangles.z, MIN_COORD_FLOAT, MAX_COORD_FLOAT ); // not clamped in original valve's code, idk why

SetAbsOrigin( neworigin );
SetAbsVelocity( vec3_origin ); // stop movement
SetLocalAngles( newangles );
SnapEyeAngles( newangles );
}

bool CBasePlayer::SetObserverTarget(CBaseEntity *target)
Expand Down