Merge branch 'feature/speedtiles' of github.com:AssassinTee/ddnet int…

…o feature/speedtiles2
AssassinTee · Feb 11, 2025 · c011b25 · c011b25
2 parents d4273ce + 7afc7e6
commit c011b25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/game/client/prediction/entities/character.cpp b/src/game/client/prediction/entities/character.cpp
@@ -706,12 +706,12 @@ void CCharacter::HandleSkippableTiles(int Index)
 			}
 			else
 			{
-				float TempMaxSpeed = MaxSpeed / 5.0f;
+				Force = minimum(Force, MaxSpeed);
 				TempVel += Direction * Force;
 				float NextSpeed = length(TempVel);
-				if(NextSpeed > TempMaxSpeed)
+				if(NextSpeed > MaxSpeed)
 				{
-					TempVel *= TempMaxSpeed / NextSpeed;
+					TempVel *= MaxSpeed / NextSpeed;
 				}
 			}
 			m_Core.m_Vel = ClampVel(m_MoveRestrictions, TempVel);

diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
@@ -1482,12 +1482,12 @@ void CCharacter::HandleSkippableTiles(int Index)
 			}
 			else
 			{
-				float TempMaxSpeed = MaxSpeed / 5.0f;
+				Force = minimum(Force, MaxSpeed);
 				TempVel += Direction * Force;
 				float NextSpeed = length(TempVel);
-				if(NextSpeed > TempMaxSpeed)
+				if(NextSpeed > MaxSpeed)
 				{
-					TempVel *= TempMaxSpeed / NextSpeed;
+					TempVel *= MaxSpeed / NextSpeed;
 				}
 			}
 			m_Core.m_Vel = ClampVel(m_MoveRestrictions, TempVel);