ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compiler warnings.

Browse Source
This commit is contained in:
hiker 2017-03-24 08:41:17 +11:00
parent 0f37f7cdc0
commit b26d833e84
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/shader_based_renderer.cpp
View File

@ -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; i<Camera::getNumCameras(); i++)
{

4
src/input/input_manager.cpp
View File

@ -1180,12 +1180,12 @@ EventPropagation InputManager::input(const SEvent& event)
if (UserConfigParams::m_multitouch_accelerometer == 1)
{
button->axis_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);
}
}

4
src/karts/kart.cpp
View File

@ -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;
}