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

Issue #1588

Browse Source 
Fixed crashes in track info screen
This commit is contained in:
Marc Coll Carrillo 2014-10-04 12:15:11 +02:00
parent f520e38cd5
commit ee49604856
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/states_screens/track_info_screen.cpp
View File

@ -70,6 +70,16 @@ void TrackInfoScreen::loadedFromFile()
m_ai_kart_spinner = getWidget<SpinnerWidget>("ai-spinner"); m_ai_kart_spinner = getWidget<SpinnerWidget>("ai-spinner");
m_reverse = getWidget<CheckBoxWidget>("reverse"); m_reverse = getWidget<CheckBoxWidget>("reverse");
m_reverse->setState(false); m_reverse->setState(false);
m_highscore_label = getWidget<LabelWidget>("highscores");
m_kart_icons[0] = getWidget<IconButtonWidget>("iconscore1");
m_kart_icons[1] = getWidget<IconButtonWidget>("iconscore2");
m_kart_icons[2] = getWidget<IconButtonWidget>("iconscore3");
m_highscore_entries[0] = getWidget<LabelWidget>("highscore1");
m_highscore_entries[1] = getWidget<LabelWidget>("highscore2");
m_highscore_entries[2] = getWidget<LabelWidget>("highscore3");
} // loadedFromFile } // loadedFromFile
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -181,30 +191,16 @@ void TrackInfoScreen::init()
m_reverse->setState(false); m_reverse->setState(false);
// ---- High Scores // ---- High Scores
if (has_highscores) m_highscore_label->setVisible(has_highscores);
{
m_kart_icons[0] = getWidget<IconButtonWidget>("iconscore1");
m_kart_icons[1] = getWidget<IconButtonWidget>("iconscore2");
m_kart_icons[2] = getWidget<IconButtonWidget>("iconscore3");
m_highscore_entries[0] = getWidget<LabelWidget>("highscore1"); m_kart_icons[0]->setVisible(has_highscores);
m_highscore_entries[1] = getWidget<LabelWidget>("highscore2"); m_kart_icons[1]->setVisible(has_highscores);
m_highscore_entries[2] = getWidget<LabelWidget>("highscore3"); m_kart_icons[2]->setVisible(has_highscores);
updateHighScores(); m_highscore_entries[0]->setVisible(has_highscores);
} m_highscore_entries[1]->setVisible(has_highscores);
else m_highscore_entries[2]->setVisible(has_highscores);
{
getWidget<IconButtonWidget>("iconscore1")->setVisible(false);
getWidget<IconButtonWidget>("iconscore2")->setVisible(false);
getWidget<IconButtonWidget>("iconscore3")->setVisible(false);
getWidget<LabelWidget>("highscores")->setVisible(false);
getWidget<LabelWidget>("highscore1")->setVisible(false);
getWidget<LabelWidget>("highscore2")->setVisible(false);
getWidget<LabelWidget>("highscore3")->setVisible(false);
}
RibbonWidget* bt_start = getWidget<GUIEngine::RibbonWidget>("buttons"); RibbonWidget* bt_start = getWidget<GUIEngine::RibbonWidget>("buttons");
bt_start->setFocusForPlayer(PLAYER_ID_GAME_MASTER); bt_start->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
@ -220,6 +216,9 @@ TrackInfoScreen::~TrackInfoScreen()
void TrackInfoScreen::updateHighScores() void TrackInfoScreen::updateHighScores()
{ {
if (!race_manager->modeHasHighscores())
return;
std::string game_mode_ident = RaceManager::getIdentOf( race_manager->getMinorMode() ); std::string game_mode_ident = RaceManager::getIdentOf( race_manager->getMinorMode() );
const Highscores::HighscoreType type = "HST_" + game_mode_ident; const Highscores::HighscoreType type = "HST_" + game_mode_ident;
@ -281,7 +280,7 @@ void TrackInfoScreen::onEnterPressedInternal()
// Create a copy of member variables we still need, since they will // Create a copy of member variables we still need, since they will
// not be accessible after dismiss: // not be accessible after dismiss:
const int num_laps = race_manager->modeHasLaps() ? m_lap_spinner->getValue() const int num_laps = race_manager->modeHasLaps() ? m_lap_spinner->getValue()
: -1; : -1;
const bool reverse_track = m_reverse == NULL ? false const bool reverse_track = m_reverse == NULL ? false
: m_reverse->getState(); : m_reverse->getState();
@ -318,10 +317,7 @@ void TrackInfoScreen::eventCallback(Widget* widget, const std::string& name,
race_manager->setReverseTrack(m_reverse->getState()); race_manager->setReverseTrack(m_reverse->getState());
// Makes sure the highscores get swapped when clicking the 'reverse' // Makes sure the highscores get swapped when clicking the 'reverse'
// checkbox. // checkbox.
if (race_manager->modeHasHighscores()) updateHighScores();
{
updateHighScores();
}
} }
else if (name == "lap-spinner") else if (name == "lap-spinner")
{ {

9
src/states_screens/track_info_screen.hpp
View File

@ -58,18 +58,21 @@ class TrackInfoScreen : public GUIEngine::Screen,
/** Check box for reverse mode. */ /** Check box for reverse mode. */
GUIEngine::CheckBoxWidget* m_reverse; GUIEngine::CheckBoxWidget* m_reverse;
/** The label of the highscore list. */
GUIEngine::LabelWidget* m_highscore_label;
/** The icons for the highscore list. */ /** The icons for the highscore list. */
GUIEngine::IconButtonWidget* m_kart_icons[HIGHSCORE_COUNT]; GUIEngine::IconButtonWidget* m_kart_icons[HIGHSCORE_COUNT];
/** The actual highscore text values shown. */ /** The actual highscore text values shown. */
GUIEngine::LabelWidget* m_highscore_entries[HIGHSCORE_COUNT]; GUIEngine::LabelWidget* m_highscore_entries[HIGHSCORE_COUNT];
void updateHighScores(); void updateHighScores();
public: public:
TrackInfoScreen(); TrackInfoScreen();
virtual ~TrackInfoScreen(); virtual ~TrackInfoScreen();
virtual void init(); virtual void init();
virtual void loadedFromFile(); virtual void loadedFromFile();
virtual void eventCallback(GUIEngine::Widget *,const std::string &name , virtual void eventCallback(GUIEngine::Widget *,const std::string &name ,