aboutsummaryrefslogtreecommitdiff
path: root/engines/tony/tony.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/tony/tony.cpp')
-rw-r--r--engines/tony/tony.cpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 76f6cfcecb..f86576d5c2 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -216,12 +216,14 @@ void TonyEngine::PlayMusic(int nChannel, const char *fn, int nFX, bool bLoop, in
m_stream[nextChannel]->Stop();
m_stream[nextChannel]->UnloadFile();
-#ifndef DEMO
- if (!m_stream[nextChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync))
- theGame.Abort();
-#else
- m_stream[nextChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync);
-#endif
+
+ if (!getIsDemo()) {
+ if (!m_stream[nextChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync))
+ theGame.Abort();
+ } else {
+ m_stream[nextChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync);
+ }
+
m_stream[nextChannel]->SetLoop(bLoop);
m_stream[nextChannel]->Play();
@@ -229,12 +231,13 @@ void TonyEngine::PlayMusic(int nChannel, const char *fn, int nFX, bool bLoop, in
}
else
{
-#ifndef DEMO
- if (!m_stream[nChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync))
- theGame.Abort();
-#else
- m_stream[nChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync);
-#endif
+ if (!getIsDemo()) {
+ if (!m_stream[nChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync))
+ theGame.Abort();
+ } else {
+ m_stream[nChannel]->LoadFile(path_buffer,FPCODEC_ADPCM,nSync);
+ }
+
m_stream[nChannel]->SetLoop(bLoop);
m_stream[nChannel]->Play();
}