X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Fsimplecontroller.cpp;h=df828d5498832bf480cea9767518dae92dc6014a;hp=d04acab4a045502d6326927429c625fd568a2d29;hb=0a7f23a01e45f1313b9f6f7f703da10aab8d060d;hpb=b652dfb998dd416d26f909798e58964ef84eda11

diff --git a/source/libr2c2/simplecontroller.cpp b/source/libr2c2/simplecontroller.cpp
index d04acab..df828d5 100644
--- a/source/libr2c2/simplecontroller.cpp
+++ b/source/libr2c2/simplecontroller.cpp
@@ -61,17 +61,9 @@ void SimpleController::tick(const Time::TimeDelta &dt)
 {
 	float secs = dt/Time::sec;
 	if(speed<target_speed.value)
-	{
-		speed += secs*accel;
-		if(speed>target_speed.value)
-			speed = target_speed.value;
-	}
+		speed = min(speed+secs*accel, target_speed.value);
 	else if(speed>target_speed.value)
-	{
-		speed -= secs*accel;
-		if(speed<target_speed.value)
-			speed = target_speed.value;
-	}
+		speed = max(speed-secs*accel, target_speed.value);
 }
 
 } // namespace R2C2