summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-07-10 15:38:37 +0200
committerkrzys-h <krzys_h@interia.pl>2014-07-10 15:38:37 +0200
commit7b04f673580f0c24aecc103a25c4c4b82da1380f (patch)
tree57fa168513ab2bc99daa434032f538abfc3bf444 /src/ui
parent1ee0c0e8fe2b4f0cba35b65b2c17deaa9f1dc8e8 (diff)
downloadcolobot-7b04f673580f0c24aecc103a25c4c4b82da1380f.tar.gz
colobot-7b04f673580f0c24aecc103a25c4c4b82da1380f.tar.bz2
colobot-7b04f673580f0c24aecc103a25c4c4b82da1380f.zip
Fixed music loading
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/maindialog.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index c6322b6..2699b46 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -764,7 +764,7 @@ pb->SetState(STATE_SHADOW);
{
if (!m_sound->IsPlayingMusic())
{
- m_sound->PlayMusic("music/Intro1.ogg", false);
+ m_sound->PlayMusic("Intro1.ogg", false);
}
}
@@ -2013,7 +2013,7 @@ bool CMainDialog::EventProcess(const Event &event)
{
if (!m_sound->IsPlayingMusic())
{
- m_sound->PlayMusic("music/Intro2.ogg", true);
+ m_sound->PlayMusic("Intro2.ogg", true);
}
}
@@ -3579,7 +3579,7 @@ void CMainDialog::SetUserDir(char *base, int rank)
void CMainDialog::BuildSceneName(std::string &filename, char *base, int rank)
{
- //TODO: Support for more than 100
+ //TODO: Support for more than 9 chapters
int chapter = rank/100;
int new_rank = rank%100;
@@ -3614,7 +3614,6 @@ void CMainDialog::BuildSceneName(std::string &filename, char *base, int rank)
outstream << "scene.txt";
}
filename = outstream.str();
- std::cout << filename.c_str() << std::endl;
}
}