Merge branch 'master' of github.com:supertuxkart/stk-code

src/graphics/irr_driver.cpp

@@ -499,6 +499,7 @@ void IrrDriver::initDevice()
     m_glsl = (m_gl_major_version > 3 || (m_gl_major_version == 3 && m_gl_minor_version >= 1));
 #endif
     initGL();
+    m_sync = 0;
 
     // Parse extensions
     hasVSLayer = false;

src/graphics/irr_driver.hpp

@@ -208,7 +208,7 @@ private:
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
     bool m_need_srgb_workaround;
-    GLsync m_sync = 0;
+    GLsync m_sync;
     /** The irrlicht device. */
     IrrlichtDevice             *m_device;
     /** Irrlicht scene manager. */

src/karts/cannon_animation.cpp

@@ -46,8 +46,6 @@ CannonAnimation::CannonAnimation(AbstractKart *kart, Ipo *ipo)
     const float dt = 0.1f;
     Vec3 xyz1;
     m_curve->update(dt, &xyz1);
-    core::vector3df rot1 = (xyz1-m_previous_orig_xyz).toIrrVector()
-                                                     .getHorizontalAngle();
     core::vector3df rot = (m_previous_orig_xyz-xyz1).toIrrVector()
                                                     .getHorizontalAngle();
     btQuaternion q(Vec3(0,1,0),rot.Y*DEGREE_TO_RAD);

src/physics/btKart.cpp

@@ -382,8 +382,7 @@ void btKart::updateVehicle( btScalar step )
     m_visual_wheels_touch_ground = true;
     for (int i=0;i<m_wheelInfo.size();i++)
     {
-        btScalar depth;
-        depth = rayCast( i);
+        rayCast( i);
         if(m_wheelInfo[i].m_raycastInfo.m_isInContact)
             m_num_wheels_on_ground++;
     }

src/states_screens/race_gui.cpp

@@ -734,7 +734,6 @@ void RaceGUI::drawSpeedEnergyRank(const AbstractKart* kart,
     float speed_ratio = speed/KILOMETERS_PER_HOUR/110.0f;
     if(speed_ratio>1) speed_ratio = 1;
 
-    video::ITexture   *bar_texture = m_speed_bar_icon->getTexture();
     video::S3DVertex vertices[5];
     unsigned int count;