applied stephan's patch for the menu-sounds .. copied file wavs/tintagel/deselect_option.wav to wavs/tintagel/select_option.wav for the time being, since code expects that file

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1241 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/gui/menu_manager.cpp

@@ -45,6 +45,7 @@
 #include "help_menu.hpp"
 #include "credits_menu.hpp"
 #include "grand_prix_select.hpp"
+#include "sound_manager.hpp"
 
 MenuManager* menu_manager= new MenuManager();
 
@@ -64,12 +65,25 @@ MenuManager::~MenuManager()
 //-----------------------------------------------------------------------------
 void MenuManager::pushMenu(MenuManagerIDs id)
 {
+    // used to suppress select-sound on startup
+    static bool is_startup = true;
+
+    if( MENUID_EXITGAME == id )
+    {
+        sound_manager->playSfx(SOUND_BACK_MENU);
+    }
+    else
+    {
+        if( !is_startup ) sound_manager->playSfx(SOUND_SELECT_MENU);
+        else is_startup = false;
+    }
     m_menu_stack.push_back(id);
 }
 
 //-----------------------------------------------------------------------------
 void MenuManager::popMenu()
 {
+    sound_manager->playSfx(SOUND_BACK_MENU);
     m_menu_stack.pop_back();
 }
 

src/sound_manager.cpp

@@ -93,11 +93,9 @@ SoundManager::SoundManager()
         sfx = new SFXImpl("wavs/radio/squeaky.wav"); m_sfxs[SOUND_USE_PARACHUTE] = sfx;
         sfx = new SFXImpl("wavs/wee.wav"); m_sfxs[SOUND_WEE] = sfx;
 
-        //FIXME: The following 3 sounds are not used in the game yet.
         sfx = new SFXImpl("wavs/tintagel/deselect_option.wav"); m_sfxs[SOUND_BACK_MENU] = sfx;
-        //sfx = new SFXImpl("wavs/tintagel/select_option.wav"); m_sfxs[SOUND_SELECT_MENU] = sfx;
+        sfx = new SFXImpl("wavs/tintagel/select_option.wav"); m_sfxs[SOUND_SELECT_MENU] = sfx;
         sfx = new SFXImpl("wavs/tintagel/move_option.wav"); m_sfxs[SOUND_MOVE_MENU] = sfx;
-
         sfx = new SFXImpl("wavs/tintagel/energy_bar_full.wav"); m_sfxs[SOUND_FULL] = sfx;
         sfx = new SFXImpl("wavs/tintagel/pre_start_race.wav"); m_sfxs[SOUND_PRESTART] = sfx;
         sfx = new SFXImpl("wavs/tintagel/start_race.wav"); m_sfxs[SOUND_START] = sfx;

src/sound_manager.hpp

@@ -29,7 +29,7 @@ enum enumSFX {SOUND_UGH,  SOUND_WINNER, SOUND_CRASH, SOUND_GRAB,
               SOUND_SHOT, SOUND_WEE,   SOUND_EXPLOSION,
               SOUND_BZZT, SOUND_BEEP,
               SOUND_BACK_MENU, SOUND_USE_ANVIL, SOUND_USE_PARACHUTE,
-              /*SOUND_SELECT_MENU,*/ SOUND_MOVE_MENU, SOUND_FULL,
+              SOUND_SELECT_MENU, SOUND_MOVE_MENU, SOUND_FULL,
               SOUND_PRESTART, SOUND_START, SOUND_MISSILE_LOCK,
               SOUND_TRAFFIC_JAM, NUM_SOUNDS};
 

src/widget_set.cpp

@@ -1277,7 +1277,11 @@ void WidgetSet::dump(int id, int d)
 //-----------------------------------------------------------------------------
 void WidgetSet::pulse(int id, float k)
 {
-    if (id) m_widgets[id].scale = k;
+    if (id) 
+    {
+        m_widgets[id].scale = k;
+        sound_manager->playSfx(SOUND_MOVE_MENU);
+    }
 }
 
 //-----------------------------------------------------------------------------