diff options
author | krzys-h <krzys_h@interia.pl> | 2013-12-31 16:58:21 +0100 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2013-12-31 16:58:21 +0100 |
commit | 999490e88bc699b671b94b88c9a4327d963db378 (patch) | |
tree | d2f27e5c80fe00358e5759e9ee40b2fd11d1ccff /src/sound/sound.h | |
parent | 4a237f5925eb0d371e097416b17dd5e919cd2258 (diff) | |
download | colobot-999490e88bc699b671b94b88c9a4327d963db378.tar.gz colobot-999490e88bc699b671b94b88c9a4327d963db378.tar.bz2 colobot-999490e88bc699b671b94b88c9a4327d963db378.zip |
Code for changing music in pause mode
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
Diffstat (limited to 'src/sound/sound.h')
-rw-r--r-- | src/sound/sound.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/sound/sound.h b/src/sound/sound.h index d2eee9c..135ee43 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -287,7 +287,7 @@ public: * \param fadeTime - time of transition between music * \return return true on success */ - virtual bool PlayMusic(int rank, bool bRepeat, float fadeTime=5.0f); + virtual bool PlayMusic(int rank, bool bRepeat, float fadeTime=2.0f); /** Start playing music * \param filename - name of file to play @@ -295,27 +295,38 @@ public: * \param fadeTime - time of transition between music * \return return true on success */ - virtual bool PlayMusic(const std::string &filename, bool bRepeat, float fadeTime=5.0f); + virtual bool PlayMusic(const std::string &filename, bool bRepeat, float fadeTime=2.0f); /** Restart music - * @return return true on success + * \return return true on success */ virtual bool RestartMusic(); - /** Susspend paying music - * \return return true on success + /** Susspend playing music + * \return nothing */ virtual void SuspendMusic(); /** Stop playing music - * \return return true on success + * \return nothing */ - virtual void StopMusic(float fadeTime=5.0f); + virtual void StopMusic(float fadeTime=2.0f); /** Check if music if playing * \return return true if music is playing */ virtual bool IsPlayingMusic(); + + /** Start playing pause music + * \param filename - name of file to play + * \return return true on success + */ + virtual bool PlayPauseMusic(const std::string &filename); + + /** Stop playing pause music and return to the mission music + * \return nothing + */ + virtual void StopPauseMusic(); protected: std::string m_soundPath; |