Merge pull request #202 from AruMoon/fix-spec_goto-crash

Fix spec_goto old crash
This commit is contained in:
nillerusr 2023-02-20 20:18:22 +03:00 committed by GitHub
commit d06435a8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2607,10 +2607,22 @@ void CBasePlayer::ObserverUse( bool bIsPressed )
void CBasePlayer::JumptoPosition(const Vector &origin, const QAngle &angles) void CBasePlayer::JumptoPosition(const Vector &origin, const QAngle &angles)
{ {
SetAbsOrigin( origin ); Vector neworigin;
SetAbsVelocity( vec3_origin ); // stop movement QAngle newangles;
SetLocalAngles( angles );
SnapEyeAngles( angles ); // 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) bool CBasePlayer::SetObserverTarget(CBaseEntity *target)