Add voices to the chargen class questions

apps/openmw/mwgui/charactercreation.cpp

@@ -9,6 +9,7 @@
 #include "mode.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwsound/soundmanager.hpp"
 
 namespace
 {
@@ -16,6 +17,7 @@ namespace
     {
         const char* mText;
         const char* mButtons[3];
+        const char* mSound;
         ESM::Class::Specialization mSpecializations[3]; // The specialization for each answer
     };
 
@@ -25,6 +27,7 @@ namespace
         {"Draw your dagger, mercifully endings its life with a single thrust.",
         "Use herbs from your pack to put it to sleep.",
         "Do not interfere in the natural evolution of events, but rather take the opportunity to learn more about a strange animal that you have never seen before."},
+        "vo\\misc\\chargen qa1.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 2
@@ -32,6 +35,7 @@ namespace
         {"Work in the forge with him casting iron for a new plow.",
         "Gather herbs for your mother who is preparing dinner.",
         "Go catch fish at the stream using a net and line."},
+        "vo\\misc\\chargen qa2.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 3
@@ -39,6 +43,7 @@ namespace
         {"Beat up your cousin, then tell him that if he ever calls you that nickname again, you will bloody him worse than this time.",
         "Make up a story that makes your nickname a badge of honor instead of something humiliating.",
         "Make up an even more embarrassing nickname for him and use it constantly until he learns his lesson."},
+        "vo\\misc\\chargen qa3.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 4
@@ -46,6 +51,7 @@ namespace
         {"This is a terrible practice. A person's thoughts are his own and no one, not even a king, has the right to make such an invasion into another human's mind.",
         "Loyal followers to the king have nothing to fear from a Telepath. It is important to have a method of finding assassins and spies before it is too late.",
         "In these times, it is a necessary evil. Although you do not necessarily like the idea, a Telepath could have certain advantages during a time of war or in finding someone innocent of a crime."},
+        "vo\\misc\\chargen qa4.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 5
@@ -53,6 +59,7 @@ namespace
         {"Return to the store and give the shopkeeper his hard-earned money, explaining to him the mistake?",
         "Decide to put the extra money to good use and purchase items that would help your family?",
         "Pocket the extra money, knowing that shopkeepers in general tend to overcharge customers anyway?"},
+        "vo\\misc\\chargen qa5.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 6
@@ -60,6 +67,7 @@ namespace
         {"Pick up the bag and signal to the guard, knowing that the only honorable thing to do is return the money to its rightful owner.",
         "Leave the bag there, knowing that it is better not to get involved.",
         "Pick up the bag and pocket it, knowing that the extra windfall will help your family in times of trouble."},
+        "vo\\misc\\chargen qa6.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 7
@@ -67,6 +75,7 @@ namespace
         {"Decline his offer, knowing that your father expects you to do the work, and it is better not to be in debt.",
         "Ask him to help you, knowing that two people can do the job faster than one, and agree to help him with one task of his choosing in the future.",
         "Accept his offer, reasoning that as long as the stables are cleaned, it matters not who does the cleaning."},
+        "vo\\misc\\chargen qa7.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 8
@@ -74,6 +83,7 @@ namespace
         {"Position yourself between the pipe and your mother.",
         "Grab the hot pipe and try to push it away.",
         "Push your mother out of the way."},
+        "vo\\misc\\chargen qa8.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 9
@@ -81,6 +91,7 @@ namespace
         {"Drop the sweetroll and step on it, then get ready for the fight.",
         "Give him the sweetroll now without argument, knowing that later this afternoon you will have all your friends with you and can come and take whatever he owes you.",
         "Act like you're going to give him the sweetroll, but at the last minute throw it in the air, hoping that they'll pay attention to it long enough for you to get a shot in on the leader."},
+        "vo\\misc\\chargen qa9.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         },
         // Question 10
@@ -88,6 +99,7 @@ namespace
         {"Rush to the town's aid immediately, despite your lack of knowledge of the circumstances.",
         "Stand aside and allow the man and the mob to pass, realizing it is probably best not to get involved.",
         "Rush to the man's aid immediately, despite your lack of knowledge of the circumstances."},
+        "vo\\misc\\chargen qa10.wav",
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         }
     } };
@@ -479,6 +491,8 @@ void CharacterCreation::onCreateClassDialogBack()
 
 void CharacterCreation::onClassQuestionChosen(int _index)
 {
+    MWBase::Environment::get().getSoundManager()->stopSay();
+
     if (mGenerateClassQuestionDialog)
         mWM->removeDialog(mGenerateClassQuestionDialog);
     if (_index < 0 || _index >= 3)
@@ -584,6 +598,8 @@ void CharacterCreation::showClassQuestionDialog()
     mGenerateClassQuestionDialog->setButtons(buttons);
     mGenerateClassQuestionDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassQuestionChosen);
     mGenerateClassQuestionDialog->open();
+
+    MWBase::Environment::get().getSoundManager()->say(sGenerateClassSteps[mGenerateClassStep].mSound);
 }
 
 void CharacterCreation::onGenerateClassBack()

apps/openmw/mwsound/soundmanager.cpp

@@ -228,11 +228,47 @@ namespace MWSound
         }
     }
 
+    void SoundManager::say(const std::string& filename)
+    {
+        if(!mOutput->isInitialized())
+            return;
+        try
+        {
+            float basevol = mMasterVolume * mSFXVolume;
+            std::string filePath = "Sound/"+filename;
+
+            SoundPtr sound = mOutput->playSound(filePath, basevol, 1.0f, Play_Normal);
+            sound->mBaseVolume = basevol;
+
+            mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), std::string("_say_sound"));
+        }
+        catch(std::exception &e)
+        {
+            std::cout <<"Sound Error: "<<e.what()<< std::endl;
+        }
+    }
+
     bool SoundManager::sayDone(MWWorld::Ptr ptr) const
     {
         return !isPlaying(ptr, "_say_sound");
     }
 
+    void SoundManager::stopSay(MWWorld::Ptr ptr)
+    {
+        SoundMap::iterator snditer = mActiveSounds.begin();
+        while(snditer != mActiveSounds.end())
+        {
+            if(snditer->second.first == ptr && snditer->second.second == "_say_sound")
+            {
+                snditer->first->stop();
+                mActiveSounds.erase(snditer++);
+            }
+            else
+                snditer++;
+        }
+    }
+
+
 
     SoundPtr SoundManager::playSound(const std::string& soundId, float volume, float pitch, int mode)
     {

apps/openmw/mwsound/soundmanager.hpp

@@ -97,11 +97,18 @@ namespace MWSound
 
         void say(MWWorld::Ptr reference, const std::string& filename);
         ///< Make an actor say some text.
-        /// \param filename name of a sound file in "Sound/Vo/" in the data directory.
+        /// \param filename name of a sound file in "Sound/" in the data directory.
 
-        bool sayDone(MWWorld::Ptr reference) const;
+        void say(const std::string& filename);
+        ///< Say some text, without an actor ref
+        /// \param filename name of a sound file in "Sound/" in the data directory.
+
+        bool sayDone(MWWorld::Ptr reference=MWWorld::Ptr()) const;
         ///< Is actor not speaking?
 
+        void stopSay(MWWorld::Ptr reference=MWWorld::Ptr());
+        ///< Stop an actor speaking
+
         SoundPtr playSound(const std::string& soundId, float volume, float pitch, int mode=Play_Normal);
         ///< Play a sound, independently of 3D-position