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

Fix FTL having no highscores as expected; don't display highscores in end-of-race dialogs when the mode has none

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-02-18 02:08:11 +00:00
parent 7969c3cb47
commit 76c6ddbc93
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modes/world.cpp
View File

@@ -76,8 +76,11 @@ World* World::m_world = NULL;
*/
World::World() : WorldStatus()
{
m_physics = NULL;
m_race_gui = NULL;
m_physics = NULL;
m_race_gui = NULL;
m_use_highscores = true;
m_track = NULL;
WorldStatus::setClockMode(CLOCK_CHRONO);
} // World
@@ -89,7 +92,6 @@ World::World() : WorldStatus()
void World::init()
{
race_state = new RaceState();
m_track = NULL;
m_faster_music_active = false;
m_fastest_lap = 9999999.9f;
m_fastest_kart = 0;
@@ -97,8 +99,6 @@ void World::init()
m_eliminated_players = 0;
m_num_players = 0;
m_use_highscores = true;
// Create the race gui before anything else is attached to the scene node
// (which happens when the track is loaded). This allows the race gui to
// do any rendering on texture.

11
src/states_screens/dialogs/race_over_dialog.cpp
View File

@@ -45,11 +45,12 @@ RaceOverDialog::RaceOverDialog(const float percentWidth,
// Switch to barrier mode: server waits for ack from each client
network_manager->beginRaceResultBarrier();
std::cout << "race_manager->getMajorMode()=" << race_manager->getMajorMode()
<< ", RaceManager::MAJOR_MODE_GRAND_PRIX=" << RaceManager::MAJOR_MODE_GRAND_PRIX
<< ", RaceManager::MAJOR_MODE_SINGLE=" << RaceManager::MAJOR_MODE_SINGLE << "\n";
const bool show_highscores = (race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX);
//std::cout << "race_manager->getMajorMode()=" << race_manager->getMajorMode()
// << ", RaceManager::MAJOR_MODE_GRAND_PRIX=" << RaceManager::MAJOR_MODE_GRAND_PRIX
// << ", RaceManager::MAJOR_MODE_SINGLE=" << RaceManager::MAJOR_MODE_SINGLE << "\n";
const bool show_highscores = (race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX) &&
World::getWorld()->useHighScores();
const int text_height = GUIEngine::getFontHeight();