[Supertuxkart-commit] SF.net SVN: supertuxkart:[6865] main/trunk/src/karts/kart.cpp

[<hik...@us...>]

Revision: 6865
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=6865&view=rev
Author:   hikerstk
Date:     2010-12-06 06:07:50 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
Fixed odd engine sfx at high speed (speed wasn't capped when it 
was used, resulting in a fraction becoming >1, resulting in incorrect
gear usage). See bug 3124797.

Modified Paths:
--------------
    main/trunk/src/karts/kart.cpp

Modified: main/trunk/src/karts/kart.cpp
===================================================================
--- main/trunk/src/karts/kart.cpp	2010-12-05 22:30:24 UTC (rev 6864)
+++ main/trunk/src/karts/kart.cpp	2010-12-06 06:07:50 UTC (rev 6865)
@@ -1378,10 +1378,13 @@
             // ignoring the gear settings from stk_config, but providing a
             // good enough brrrBRRRbrrrBRRR sound effect. Speed factor makes
             // it a "staired sawtooth", so more acoustically rich.
-            float gears = 3.0f * fmod((float)(m_speed / max_speed), 0.333334f);
-            m_engine_sound->speed(0.6f +
-                                  (float)(m_speed / max_speed) * 0.35f +
-                                  gears * 0.35f);
+            float f = m_speed/max_speed;
+            // Speed at this stage is not yet capped, so it can be > 1, which 
+            // results in odd engine sfx.
+            if (f>1.0f) f=1.0f;
+
+            float gears = 3.0f * fmod(f, 0.333334f);
+            m_engine_sound->speed(0.6f + (f +gears)* 0.35f);
         }
         else
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.