From b26d833e8419263051067a7f7bb59cd6a803c3ce Mon Sep 17 00:00:00 2001 From: hiker Date: Fri, 24 Mar 2017 08:41:17 +1100 Subject: [PATCH] Fixed compiler warnings. --- src/graphics/shader_based_renderer.cpp | 4 ++-- src/input/input_manager.cpp | 4 ++-- src/karts/kart.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp index b0cd78b38..c1bcba02a 100644 --- a/src/graphics/shader_based_renderer.cpp +++ b/src/graphics/shader_based_renderer.cpp @@ -865,8 +865,8 @@ void ShaderBasedRenderer::render(float dt) irr_driver->getActualScreenSize().Height)); m_current_screen_size = core::vector2df( - irr_driver->getActualScreenSize().Width, - irr_driver->getActualScreenSize().Height); + (float)irr_driver->getActualScreenSize().Width, + (float)irr_driver->getActualScreenSize().Height); for(unsigned int i=0; iaxis_x = -event.AccelerometerEvent.X / 5.0f; + button->axis_x = (float)-event.AccelerometerEvent.X / 5.0f; device->handleControls(button); } else if (UserConfigParams::m_multitouch_accelerometer == 2) { - button->axis_x = event.AccelerometerEvent.Y / 5.0f; + button->axis_x = (float)event.AccelerometerEvent.Y / 5.0f; device->handleControls(button); } } diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index f8e4972d4..1d17d89e8 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -2345,13 +2345,13 @@ void Kart::updateEngineSFX(float dt) if (fc>1.0f) fc = 1.0f; float gears = 3.0f * fmod(fc, 0.333334f); assert(!std::isnan(f)); - m_last_factor_engine_sound = (0.9*f + gears) * 0.35f; + m_last_factor_engine_sound = (0.9f*f + gears) * 0.35f; m_engine_sound->setSpeedPosition(0.6f + m_last_factor_engine_sound, getXYZ()); } else { // When flying, reduce progressively the sound engine (since we can't accelerate) - m_last_factor_engine_sound *= (1.0f-0.1*dt); + m_last_factor_engine_sound *= (1.0f-0.1f*dt); m_engine_sound->setSpeedPosition(0.6f + m_last_factor_engine_sound, getXYZ()); if (m_speed < 0.1f) m_last_factor_engine_sound = 0.0f; }