diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-05-02 10:44:07 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-05-02 10:44:07 +0200 |
| commit | c1db140ad36402271914be8d993413aa5f4676bc (patch) | |
| tree | 149170bedb385d1628c7bfe0d11679976e497d5a /src/ui/maindialog.cpp | |
| parent | fb5d14dddf180a369617968bc3b14492ded329af (diff) | |
| download | colobot-c1db140ad36402271914be8d993413aa5f4676bc.tar.gz colobot-c1db140ad36402271914be8d993413aa5f4676bc.tar.bz2 colobot-c1db140ad36402271914be8d993413aa5f4676bc.zip | |
Updated Main Mnu music
For now only code - we need to wait for PiXeL to give us new music :)
Diffstat (limited to 'src/ui/maindialog.cpp')
| -rw-r--r-- | src/ui/maindialog.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 2a8bb42..050f87a 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -751,7 +751,7 @@ pb->SetState(STATE_SHADOW); m_phase == PHASE_PROTO ) { if (!m_sound->IsPlayingMusic()) { - m_sound->PlayMusic("Intro.ogg", false); + m_sound->PlayMusic("Intro1.ogg", false); } if ( m_phase == PHASE_TRAINER ) m_index = 0; @@ -1746,7 +1746,7 @@ pos.y -= 0.048f; if ( m_phase == PHASE_WELCOME1 ) { m_sound->StopMusic(); - m_sound->PlayMusic("Intro.ogg", false); + m_sound->PlayMusic("Intro1.ogg", false); pos.x = 0.0f; pos.y = 0.0f; @@ -2005,6 +2005,23 @@ bool CMainDialog::EventProcess(const Event &event) //? else welcomeLength = WELCOME_LENGTH; welcomeLength = WELCOME_LENGTH; + if ( m_phase != PHASE_SIMUL && + m_phase != PHASE_WIN && + m_phase != PHASE_LOST && + m_phase != PHASE_WRITE && + m_phase != PHASE_READs && + m_phase != PHASE_WRITEs && + m_phase != PHASE_SETUPds && + m_phase != PHASE_SETUPgs && + m_phase != PHASE_SETUPps && + m_phase != PHASE_SETUPcs && + m_phase != PHASE_SETUPss ) + { + if (!m_sound->IsPlayingMusic()) { + m_sound->PlayMusic("Intro2.ogg", true); + } + } + if ( m_phase == PHASE_WELCOME1 || m_phase == PHASE_WELCOME2 || m_phase == PHASE_WELCOME3 ) |