From 93c931b912a02cd4ca9c432faed0cfe58481716a Mon Sep 17 00:00:00 2001 From: hikerstk Date: Mon, 5 Oct 2009 01:27:15 +0000 Subject: [PATCH] 1) Fixed VS compilation (no M_MPI_2 in VS). 2) Removed compiler warning. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4083 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/states_screens/feature_unlocked.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp index b7944a8db..a09d05b6b 100644 --- a/src/states_screens/feature_unlocked.cpp +++ b/src/states_screens/feature_unlocked.cpp @@ -122,7 +122,7 @@ void FeatureUnlockedCutScene::onUpdate(float dt, irr::video::IVideoDriver* drive if (m_angle > 360) m_angle -= 360; m_sky->setRotation( core::vector3df(0, m_angle, 0) ); - const float KEY_Y = 6.8; + const float KEY_Y = 6.8f; const float KEY_FINAL_DIST = 15; if (m_key_pos > KEY_FINAL_DIST) m_key_pos -= dt*5; @@ -139,7 +139,7 @@ void FeatureUnlockedCutScene::onUpdate(float dt, irr::video::IVideoDriver* drive m_camera->setPosition( core::vector3df(cos((1.0f-m_key_angle)*M_PI/4 + M_PI/4)*70.0f, 30.0f, - sin((1.0f-m_key_angle)*M_PI_2/4 + M_PI/4)*70.0f) ); + sin((1.0f-m_key_angle)*M_PI/8 + M_PI/4)*70.0f) ); //m_camera->setUpVector( core::vector3df(0.0, 1.0, 0.0) ); m_camera->setTarget( core::vector3df(0, 10, 0.0f) ); m_camera->updateAbsolutePosition();