From 7ac0c14869ff3678b3e002c10cbca4dff314b7d0 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Mon, 22 Sep 2014 23:50:53 +0200 Subject: [PATCH 1/2] Fix travis --- src/graphics/irr_driver.cpp | 1 + src/graphics/irr_driver.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 3c931f4bd..91b5103e4 100644 --- a/src/graphics/irr_driver.cpp +++ b/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; diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp index 66f2c0313..2b4f121fd 100644 --- a/src/graphics/irr_driver.hpp +++ b/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. */ From 29c162bdf8d295639c521891de018e989e0a2b24 Mon Sep 17 00:00:00 2001 From: hiker Date: Tue, 23 Sep 2014 08:56:07 +1000 Subject: [PATCH 2/2] Fixed compiler warnings. --- src/karts/cannon_animation.cpp | 2 -- src/physics/btKart.cpp | 3 +-- src/states_screens/race_gui.cpp | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/karts/cannon_animation.cpp b/src/karts/cannon_animation.cpp index cc47cba94..a44ee3f22 100644 --- a/src/karts/cannon_animation.cpp +++ b/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); diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp index d411e9708..8e28cf21a 100644 --- a/src/physics/btKart.cpp +++ b/src/physics/btKart.cpp @@ -382,8 +382,7 @@ void btKart::updateVehicle( btScalar step ) m_visual_wheels_touch_ground = true; for (int i=0;i1) speed_ratio = 1; - video::ITexture *bar_texture = m_speed_bar_icon->getTexture(); video::S3DVertex vertices[5]; unsigned int count;