From d812c0f274e3dde5fca72cbb49fa02fc8f4a06d4 Mon Sep 17 00:00:00 2001 From: auria Date: Fri, 26 Feb 2010 02:43:13 +0000 Subject: [PATCH] Apply back fix that was committed in r4817 and mysteriously reverted in r4843, plus minor improvements to battle mode end git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4852 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/states_screens/dialogs/race_over_dialog.cpp | 10 +++++++++- src/tracks/track.cpp | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/states_screens/dialogs/race_over_dialog.cpp b/src/states_screens/dialogs/race_over_dialog.cpp index 9fbd05a17..82cf47367 100644 --- a/src/states_screens/dialogs/race_over_dialog.cpp +++ b/src/states_screens/dialogs/race_over_dialog.cpp @@ -397,9 +397,17 @@ void RaceOverDialog::renderThreeStrikesGraph(const int x, const int y, const int SColor black(255,0,0,0); irr_driver->getVideoDriver()->draw2DLine( core::position2d(x, y), core::position2d(x, y + h), black); + irr_driver->getVideoDriver()->draw2DLine( core::position2d(x, y), + core::position2d(x - 7, y + 13), black); + irr_driver->getVideoDriver()->draw2DLine( core::position2d(x, y), + core::position2d(x + 7, y + 13), black); + irr_driver->getVideoDriver()->draw2DLine( core::position2d(x, y + h), core::position2d(x + w, y + h), black); - + irr_driver->getVideoDriver()->draw2DLine( core::position2d(x + w, y + h), + core::position2d(x + w - 13, y + h + 7), black); + irr_driver->getVideoDriver()->draw2DLine( core::position2d(x + w, y + h), + core::position2d(x + w - 13, y + h - 7), black); float lastEventTime = 0.0f; int max_life_count = 0; diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 2576da573..09253dbb3 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -613,14 +613,14 @@ void Track::createWater(const XMLNode &node) */ void Track::loadTrackModel(unsigned int mode_id) { - m_is_arena = false; + //m_is_arena = false; m_track_object_manager = new TrackObjectManager(); // Load the graph only now: this function is called from world, after // the race gui was created. The race gui is needed since it stores // the information about the size of the texture to render the mini // map to. - loadQuadGraph(mode_id); + if (!m_is_arena) loadQuadGraph(mode_id); // Add the track directory to the texture search path file_manager->pushTextureSearchPath(m_root); file_manager->pushModelSearchPath (m_root);