diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-05-02 10:58:38 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-05-02 10:58:38 +0200 |
| commit | 56709f0e5630a2874ccd133d08604a99f6095157 (patch) | |
| tree | e9b23c4d5ead689b03003f887a1bb13148d1023b /src | |
| parent | d9f1b4f69d4408c0357a399aa61bd38998fd354b (diff) | |
| download | colobot-56709f0e5630a2874ccd133d08604a99f6095157.tar.gz colobot-56709f0e5630a2874ccd133d08604a99f6095157.tar.bz2 colobot-56709f0e5630a2874ccd133d08604a99f6095157.zip | |
Small changes to looping main menu music
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/maindialog.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 050f87a..0b0b848 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -742,6 +742,23 @@ pb->SetState(STATE_SHADOW); CameraPerso(); } + 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("Intro1.ogg", false); + } + } + if ( m_phase == PHASE_TRAINER || m_phase == PHASE_DEFI || m_phase == PHASE_MISSION || @@ -750,10 +767,6 @@ pb->SetState(STATE_SHADOW); m_phase == PHASE_USER || m_phase == PHASE_PROTO ) { - if (!m_sound->IsPlayingMusic()) { - m_sound->PlayMusic("Intro1.ogg", false); - } - if ( m_phase == PHASE_TRAINER ) m_index = 0; if ( m_phase == PHASE_DEFI ) m_index = 1; if ( m_phase == PHASE_MISSION ) m_index = 2; @@ -1745,9 +1758,6 @@ pos.y -= 0.048f; if ( m_phase == PHASE_WELCOME1 ) { - m_sound->StopMusic(); - m_sound->PlayMusic("Intro1.ogg", false); - pos.x = 0.0f; pos.y = 0.0f; ddim.x = 0.0f; |