get back into working state

src/states_screens/dialogs/gp_info_dialog.cpp

@@ -83,17 +83,8 @@ GPInfoDialog::GPInfoDialog(const std::string& gpIdent, const float w, const floa
         const int from_y = y1 + height_of_one_line*(t+1);
 
         Track* track = track_manager->getTrack(tracks[t]);
-        stringw lineText;
-        if (track == NULL)
-        {
-            lineText = L"MISSING : ";
-            lineText.append( stringw(tracks[t].c_str()) );
-            gp_ok = false;
-        }
-        else
-        {
-            lineText = track->getName();
-        }
+        assert(track != NULL);
+        stringw lineText = track->getName();
 
         LabelWidget* widget = new LabelWidget();
         widget->setText(translations->fribidize(lineText), false);
@@ -195,7 +186,6 @@ GPInfoDialog::GPInfoDialog(const std::string& gpIdent, const float w, const floa
     okBtn->getIrrlichtElement()->setTabGroup(false);
 
     okBtn->setFocusForPlayer( PLAYER_ID_GAME_MASTER );
-
 }
 
 // ------------------------------------------------------------------------------------------------------

src/states_screens/dialogs/gp_info_dialog.hpp

@@ -32,23 +32,24 @@ namespace GUIEngine
  */
 class GPInfoDialog : public GUIEngine::ModalDialog
 {
+private:
     std::string m_gp_ident;
     GUIEngine::IconButtonWidget* m_screenshot_widget;
-    
     float m_curr_time;
-    
+
 public:
     /**
      * Creates a modal dialog with given percentage of screen width and height
+     * atm only used in track_screen.cpp
      */
-    GPInfoDialog(const std::string& gpIdent, const float percentWidth, const float percentHeight);
+    GPInfoDialog(const std::string& gpIdent, const float percentWidth,
+                 const float percentHeight);
     virtual ~GPInfoDialog();
-    
+
     void onEnterPressedInternal();
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
-    
-    virtual void onUpdate(float dt);
 
+    virtual void onUpdate(float dt);
 };
 
 #endif

src/states_screens/tracks_screen.cpp

@@ -206,12 +206,12 @@ void TracksScreen::init()
         }
     }
 
-    /*// Random GP - not finished yet
+    // Random GP - not finished yet
     std::vector<std::string> screenshots;
     screenshots.push_back("gui/main_help.png");
     gps_widget->addAnimatedItem(translations->fribidize("Random"), "Random",
                                 screenshots, 1.5f, 0,
-                                IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);*/
+                                IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
 
     gps_widget->updateItemDisplay();
 

src/tracks/track.cpp

@@ -454,10 +454,10 @@ void Track::loadTrackInfo()
     delete root;
 
     std::string dir = StringUtils::getPath(m_filename);
-    std::string easter_name = dir+"/easter_eggs.xml";
+    std::string easter_name = dir + "/easter_eggs.xml";
 
     XMLNode *easter = file_manager->createXMLTree(easter_name);
-  
+
     if(easter)
     {
         for(unsigned int i=0; i<easter->getNumNodes(); i++)
@@ -858,7 +858,7 @@ bool Track::loadMainTrack(const XMLNode &root)
     {
         mesh = irr_driver->getMesh(full_path);
     }
-    
+
     if(!mesh)
     {
         Log::fatal("track",
@@ -1886,7 +1886,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
                 libroot = library_nodes[name];
                 create_lod_definitions = false; // LOD definitions are already created, don't create them again
             }
-    
+
             scene::ISceneNode* parent = irr_driver->getSceneManager()->addEmptySceneNode();
             parent->setPosition(xyz);
             parent->setRotation(hpr);