From e1af0cc35357f22f681e0276b18543a0324ce7dd Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 9 Sep 2016 13:36:49 +1000
Subject: [PATCH] Fixed various bugs in max speed state saving.

---
 src/karts/max_speed.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/karts/max_speed.cpp b/src/karts/max_speed.cpp
index 54bcc345e..9ab14fa50 100644
--- a/src/karts/max_speed.cpp
+++ b/src/karts/max_speed.cpp
@@ -178,6 +178,7 @@ void MaxSpeed::SpeedIncrease::rewindTo(BareNetworkString *buffer,
     {
         m_max_add_speed   = buffer->getFloat();
         m_duration        = buffer->getFloat();
+        m_fade_out_time   = buffer->getFloat();
         m_current_speedup = buffer->getFloat();
         m_engine_force    = buffer->getFloat();
     }
@@ -334,11 +335,10 @@ void MaxSpeed::saveState(BareNetworkString *buffer) const
     // ------------------------
     // Get the bit pattern of all active slowdowns
     uint8_t active_slowdown = 0;
-    for(unsigned int i=MS_DECREASE_MIN; i<MS_DECREASE_MAX; i++)
+    for(unsigned int i=MS_DECREASE_MIN, b=1; i<MS_DECREASE_MAX; i++, b <<=1)
     {
-        active_slowdown <<= 1;
         if (m_speed_decrease[i].isActive()) 
-            active_slowdown |= 1;
+            active_slowdown |= b;
     }
     buffer->addUInt8(active_slowdown);
 
@@ -352,10 +352,10 @@ void MaxSpeed::saveState(BareNetworkString *buffer) const
     // --------------------------
     // Get the bit pattern of all active speedups
     uint8_t active_speedups = 0;
-    for(unsigned int i=MS_INCREASE_MIN; i<MS_INCREASE_MAX; i++)
+    for(unsigned int i=MS_INCREASE_MIN, b=1; i<MS_INCREASE_MAX; i++, b <<= 1)
     {
-        active_speedups <<= 1;
-        if(m_speed_increase[i].isActive()) active_speedups |= 1;
+        if(m_speed_increase[i].isActive())
+            active_speedups |= b;
     }
     buffer->addUInt8(active_speedups);
     for(unsigned int i=MS_INCREASE_MIN, b=1; i<MS_INCREASE_MAX; i++, b <<= 1)