diff --git a/data/challenges/islandtrack.challenge b/data/challenges/islandtrack.challenge index 007814310..3b04e9e3a 100644 --- a/data/challenges/islandtrack.challenge +++ b/data/challenges/islandtrack.challenge @@ -1,6 +1,6 @@ - + diff --git a/data/challenges/sandtrack.challenge b/data/challenges/sandtrack.challenge index 59af07d22..9010c3732 100644 --- a/data/challenges/sandtrack.challenge +++ b/data/challenges/sandtrack.challenge @@ -6,11 +6,11 @@ - + - + diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix index dbb407b50..9fd8315ab 100644 --- a/data/grandprix/3_tothemoonandback.grandprix +++ b/data/grandprix/3_tothemoonandback.grandprix @@ -1,7 +1,7 @@ - + diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 6beb981cd..f135a8e4f 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -1263,22 +1263,25 @@ scene::IMesh *IrrDriver::createTexturedQuadMesh(const video::SMaterial *material v1.Pos = core::vector3df(-w_2,-h_2,0); v1.Normal = core::vector3df(0, 0, -1.0f); v1.TCoords = core::vector2d(1,1); + v1.Color = video::SColor(255, 255, 255, 255); video::S3DVertex v2; v2.Pos = core::vector3df(w_2,-h_2,0); v2.Normal = core::vector3df(0, 0, -1.0f); v2.TCoords = core::vector2d(0,1); + v1.Color = video::SColor(255, 255, 255, 255); video::S3DVertex v3; v3.Pos = core::vector3df(w_2,h_2,0); v3.Normal = core::vector3df(0, 0, -1.0f); v3.TCoords = core::vector2d(0,0); + v3.Color = video::SColor(255, 255, 255, 255); video::S3DVertex v4; v4.Pos = core::vector3df(-w_2,h_2,0); v4.Normal = core::vector3df(0, 0, -1.0f); v4.TCoords = core::vector2d(1,0); - + v4.Color = video::SColor(255, 255, 255, 255); // Add the vertices // ---------------- diff --git a/src/karts/controller/skidding_ai.cpp b/src/karts/controller/skidding_ai.cpp index 1a89d4e4d..c50c275da 100644 --- a/src/karts/controller/skidding_ai.cpp +++ b/src/karts/controller/skidding_ai.cpp @@ -277,10 +277,21 @@ void SkiddingAI::update(float dt) } // also give him some free nitro - if (m_kart->getPosition() > 1) - m_kart->setEnergy(m_kart->getEnergy() + 7); - else - m_kart->setEnergy(m_kart->getEnergy() + 4); + if (race_manager->getDifficulty() == RaceManager::DIFFICULTY_MEDIUM) + { + if (m_kart->getPosition() > 1) + m_kart->setEnergy(m_kart->getEnergy() + 2); + else + m_kart->setEnergy(m_kart->getEnergy() + 1); + } + else if (race_manager->getDifficulty() == RaceManager::DIFFICULTY_HARD || + race_manager->getDifficulty() == RaceManager::DIFFICULTY_BEST) + { + if (m_kart->getPosition() > 1) + m_kart->setEnergy(m_kart->getEnergy() + 7); + else + m_kart->setEnergy(m_kart->getEnergy() + 4); + } } } diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp index 51c90f818..4fe0c838f 100644 --- a/src/states_screens/race_result_gui.cpp +++ b/src/states_screens/race_result_gui.cpp @@ -278,6 +278,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget, StateManager::get()->popMenu(); World::deleteWorld(); + CutsceneWorld::setUseDuration(true); StateManager::get()->enterGameState(); race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE); race_manager->setNumKarts(0);