Fix typo & Add easter egg badge

Author: CodingJellyfish

src/config/player_profile.cpp

@@ -130,7 +130,7 @@ void PlayerProfile::loadRemainingData(const XMLNode *node)
 
     // We first load the list of all favorite tracks
     // Some favorites may correspond to uninstalled addons, so we do not sanitize the strings
-    assert(m_favorite_track_statuss == NULL);
+    assert(m_favorite_track_status == NULL);
     const XMLNode *xml_favorites = node->getNode("favorites");
     m_favorite_track_status = new FavoriteTrackStatus(xml_favorites);
 

src/states_screens/easter_egg_screen.cpp

@@ -219,6 +219,8 @@ void EasterEggScreen::buildTrackList()
 
     const std::string curr_group_name = tabs->getSelectionIDString(0);
 
+    PtrVector<Track, REF> tracks;
+
     // Build track list
     if (curr_group_name == ALL_TRACK_GROUPS_ID)
     {
@@ -233,21 +235,8 @@ void EasterEggScreen::buildTrackList()
             if (curr->isArena() || curr->isSoccer()) continue;
             if (curr->isInternal()) continue;
 
-            if (PlayerManager::getCurrentPlayer()->isLocked(curr->getIdent()))
-            {
-                tracks_widget->addItem( _("Locked : solve active challenges to gain access to more!"),
-                                       "locked", curr->getScreenshotFile(), LOCKED_BADGE,
-                                       IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
-            }
-            else
-            {
-                tracks_widget->addItem(curr->getName(), curr->getIdent(),
-                                       curr->getScreenshotFile(), 0,
-                                       IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
-                m_random_track_list.push_back(curr->getIdent());
-            }
+            tracks.push_back(curr);
         }
-
     }
     else
     {
@@ -264,19 +253,34 @@ void EasterEggScreen::buildTrackList()
             if (curr->isSoccer()) continue;
             if (curr->isInternal()) continue;
 
-            if (PlayerManager::getCurrentPlayer()->isLocked(curr->getIdent()))
-            {
-                tracks_widget->addItem( _("Locked : solve active challenges to gain access to more!"),
-                                       "locked", curr->getScreenshotFile(), LOCKED_BADGE,
-                                       IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
-            }
-            else
-            {
-                tracks_widget->addItem(curr->getName(), curr->getIdent(),
-                                       curr->getScreenshotFile(), 0 /* no badge */,
-                                       IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
-                m_random_track_list.push_back(curr->getIdent());
-            }
+            tracks.push_back(curr);
+        }
+    }
+    tracks.insertionSort();
+
+    for (int n=0; n<tracks.size(); n++)
+    {
+        Track* curr = tracks.get(n);
+
+        if (PlayerManager::getCurrentPlayer()->isLocked(curr->getIdent()))
+        {
+            tracks_widget->addItem( _("Locked : solve active challenges to gain access to more!"),
+                                    "locked", curr->getScreenshotFile(), LOCKED_BADGE,
+                                    IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+        }
+        else if (PlayerManager::getCurrentPlayer()->isFavoriteTrack(curr->getIdent()))
+        {
+            tracks_widget->addItem(curr->getName(), curr->getIdent(),
+                                    curr->getScreenshotFile(), HEART_BADGE,
+                                    IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
+            m_random_track_list.push_back(curr->getIdent());
+        }
+        else
+        {
+            tracks_widget->addItem(curr->getName(), curr->getIdent(),
+                                    curr->getScreenshotFile(), 0,
+                                    IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
+            m_random_track_list.push_back(curr->getIdent());
         }
     }
 

src/states_screens/online/tracks_screen.cpp

@@ -624,7 +624,14 @@ void TracksScreen::buildTrackList()
     }
     else
     {
-        const std::vector<int>& curr_tracks = track_manager->getTracksInGroup(curr_group_name);
+        // Get all tracks in this group and concatrate into one vector
+        std::vector<int> curr_tracks        = track_manager->getTracksInGroup(curr_group_name);
+        const std::vector<int>& curr_arenas = track_manager->getArenasInGroup(curr_group_name, false);
+        const std::vector<int>& curr_soccers = track_manager->getArenasInGroup(curr_group_name, true);
+
+        curr_tracks.insert(curr_tracks.end(), curr_arenas.begin(), curr_arenas.end());
+        curr_tracks.insert(curr_tracks.end(), curr_soccers.begin(), curr_soccers.end());
+        
         const int track_amount = (int)curr_tracks.size();
 
         for (int n = 0; n < track_amount; n++)
@@ -667,6 +674,13 @@ void TracksScreen::buildTrackList()
                 "locked", curr->getScreenshotFile(), LOCKED_BADGE,
                 IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
         }
+        else if (PlayerManager::getCurrentPlayer()->isFavoriteTrack(curr->getIdent()))
+        {
+            tracks_widget->addItem(curr->getName(), curr->getIdent(),
+                curr->getScreenshotFile(), HEART_BADGE,
+                IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
+            m_random_track_list.push_back(curr->getIdent());
+        }
         else
         {
             tracks_widget->addItem(curr->getName(),