From ec73fcb2b72929c1833f08274ad224ba1db959f9 Mon Sep 17 00:00:00 2001 From: konstin Date: Wed, 16 Jul 2014 15:40:27 +0200 Subject: [PATCH] minor stuff --- src/states_screens/dialogs/random_gp_dialog.cpp | 10 +++------- src/tracks/track.cpp | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/states_screens/dialogs/random_gp_dialog.cpp b/src/states_screens/dialogs/random_gp_dialog.cpp index b63330712..1b79fa955 100644 --- a/src/states_screens/dialogs/random_gp_dialog.cpp +++ b/src/states_screens/dialogs/random_gp_dialog.cpp @@ -78,13 +78,9 @@ void RandomGPInfoDialog::addSpinners() const std::vector& groups = track_manager->getAllTrackGroups(); for (unsigned int i = 0; i < groups.size(); i++) { - // FIXME: The NULL check is necessary until #1348 on github is fixed - if (groups[i].c_str() != NULL) - { - spinner->addLabel(stringw(groups[i].c_str())); - if(groups[i] == "standard") - index_standard = i+1; - } + spinner->addLabel(stringw(groups[i].c_str())); + if(groups[i] == "standard") + index_standard = i+1; } // The value can only be set here because SpinnerWidget resets the value // every time a label is added diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 455a2bf87..7242d5419 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -135,7 +135,7 @@ Track::Track(const std::string &filename) m_ident=="overworld"; m_minimap_x_scale = 1.0f; m_minimap_y_scale = 1.0f; - m_default_number_of_laps= 3; + m_default_number_of_laps= UserConfigParams::m_num_laps; m_all_nodes.clear(); m_all_physics_only_nodes.clear(); m_all_cached_meshes.clear();