aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/music.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lab/music.cpp')
-rw-r--r--engines/lab/music.cpp24
1 files changed, 6 insertions, 18 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index b6b00cb23c..0f42064a5c 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -176,14 +176,8 @@ bool Music::initMusic() {
filename = "Music:BackGrou";
_file = g_lab->_resource->openDataFile(filename);
-
- if (_file) {
- startMusic(true);
- return true;
- }
-
- _musicOn = false;
- return false;
+ startMusic(true);
+ return true;
}
/*****************************************************************************/
@@ -278,16 +272,10 @@ void Music::changeMusic(const char *newmusic) {
}
_file = g_lab->_resource->openDataFile(newmusic);
-
- if (_file) {
- _musicOn = true; /* turn it off */
- setMusic(false);
- _musicOn = false; /* turn it back on */
- setMusic(true);
- } else {
- _file = _tFile;
- _tFile = 0;
- }
+ _musicOn = true; /* turn it off */
+ setMusic(false);
+ _musicOn = false; /* turn it back on */
+ setMusic(true);
}
/*****************************************************************************/