Merge branch 'master' of github.com:supertuxkart/stk-code

data/gui/tutorial.stkgui

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-    <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
-
-        <header I18N="Title for tutorials screen" text="Tutorial - Selection Room" text_align="center" width="100%" />
-
-        <spacer proportion="1" width="100%"/>
-
-        <list id="tutorials" proportion="5" width="75%" align="center"/>
-
-        <spacer proportion="1" width="100%"/>
-        <spacer width="100%" height="45"/>
-
-    </div>
-
-    <button id="play" x="-200" y="-40" height="35" align="right" text="Play all"/>
-</stkgui>

src/states_screens/grand_prix_win.cpp

@@ -18,6 +18,7 @@
 
 #include "states_screens/grand_prix_win.hpp"
 
+#include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
@@ -347,3 +348,12 @@ void GrandPrixWin::setKarts(const std::string idents_arg[3])
 }   // setKarts
 
 // -------------------------------------------------------------------------------------
+
+MusicInformation* GrandPrixWin::getInGameMenuMusic() const
+{
+    MusicInformation* mi = music_manager->getMusicInformation("win_theme.music");
+    return mi;
+}
+
+// -------------------------------------------------------------------------------------
+

src/states_screens/grand_prix_win.hpp

@@ -66,6 +66,7 @@ public:
     void loadedFromFile() OVERRIDE {};
     void onCutsceneEnd() OVERRIDE;
     void onUpdate(float dt) OVERRIDE;
+    MusicInformation* getInGameMenuMusic() const OVERRIDE;
 
     /** \pre must be called after pushing the screen, but before onUpdate had the chance to be invoked */
     void setKarts(const std::string idents[3]);