From 6595b96418cee422963cbdde980bd56717e71d67 Mon Sep 17 00:00:00 2001 From: Blixibon Date: Sun, 24 Jan 2021 22:28:55 -0600 Subject: [PATCH] Fixed func_rotating angles fix not being in the right place --- sp/src/game/server/bmodels.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sp/src/game/server/bmodels.cpp b/sp/src/game/server/bmodels.cpp index 8c5ca480..2a74df6c 100644 --- a/sp/src/game/server/bmodels.cpp +++ b/sp/src/game/server/bmodels.cpp @@ -960,18 +960,6 @@ void CFuncRotating::UpdateSpeed( float flNewSpeed ) RampPitchVol(); } -#ifdef MAPBASE - QAngle angNormalizedAngles = GetLocalAngles(); - if (m_vecMoveAng.x) - angNormalizedAngles.x = AngleNormalize( angNormalizedAngles.x ); - if (m_vecMoveAng.y) - angNormalizedAngles.y = AngleNormalize( angNormalizedAngles.y ); - if (m_vecMoveAng.z) - angNormalizedAngles.z = AngleNormalize( angNormalizedAngles.z ); - - SetLocalAngles(angNormalizedAngles); -#endif - SetLocalAngularVelocity( m_vecMoveAng * m_flSpeed ); } @@ -1102,6 +1090,18 @@ void CFuncRotating::RotateMove( void ) { SetMoveDoneTime( 10 ); +#ifdef MAPBASE + QAngle angNormalizedAngles = GetLocalAngles(); + if (m_vecMoveAng.x) + angNormalizedAngles.x = AngleNormalize( angNormalizedAngles.x ); + if (m_vecMoveAng.y) + angNormalizedAngles.y = AngleNormalize( angNormalizedAngles.y ); + if (m_vecMoveAng.z) + angNormalizedAngles.z = AngleNormalize( angNormalizedAngles.z ); + + SetLocalAngles(angNormalizedAngles); +#endif + if ( m_bStopAtStartPos ) { SetMoveDoneTime( GetNextMoveInterval() );