diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-04-29 15:33:28 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-04-29 15:33:28 +0200 |
| commit | c2932f4ee3c65aa5546a8b2fd605af9043aba72a (patch) | |
| tree | 595064456bd64f06171cbeea2b2e1a603d5de659 | |
| parent | 2ba146cd63cefd58f5ff464b5b94e43740cf0700 (diff) | |
| download | colobot-c2932f4ee3c65aa5546a8b2fd605af9043aba72a.tar.gz colobot-c2932f4ee3c65aa5546a8b2fd605af9043aba72a.tar.bz2 colobot-c2932f4ee3c65aa5546a8b2fd605af9043aba72a.zip | |
Added new Intro music (by PiXeL)
| m--------- | data | 0 | ||||
| -rw-r--r-- | src/sound/sound.h | 1 | ||||
| -rw-r--r-- | src/ui/maindialog.cpp | 4 |
3 files changed, 3 insertions, 2 deletions
diff --git a/data b/data -Subproject fcb194a2d35f72658138d237b27f2cdda7cd6b9 +Subproject 9a54e03b14e13f3562c6e9420213c08f3be8ec0 diff --git a/src/sound/sound.h b/src/sound/sound.h index a2302c4..11eca89 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -178,6 +178,7 @@ class CSoundInterface /** Function called to add all music files to list */ inline void AddMusicFiles(std::string path) { m_soundPath = path; + CacheMusic("Intro.ogg"); CacheMusic("music010.ogg"); CacheMusic("music011.ogg"); }; diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 092903d..699cb7b 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -747,7 +747,7 @@ pb->SetState(STATE_SHADOW); m_phase == PHASE_PROTO ) { if (!m_sound->IsPlayingMusic()) { - m_sound->PlayMusic(11, true); + m_sound->PlayMusic("Intro.ogg", false); } if ( m_phase == PHASE_TRAINER ) m_index = 0; @@ -1742,7 +1742,7 @@ pos.y -= 0.048f; if ( m_phase == PHASE_WELCOME1 ) { m_sound->StopMusic(); - m_sound->PlayMusic(11, false); + m_sound->PlayMusic("Intro.ogg", false); pos.x = 0.0f; pos.y = 0.0f; |