aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2012-06-11 05:10:24 +0200
committerSven Hesse2012-06-11 05:18:07 +0200
commita64e8a6d30fbef1de52684b75bb6f4536b28d988 (patch)
tree6ad0aa887c01a3a292ce9f6e006a959d6c5863da /engines
parent8548dea13d56e1d69b2f4743361932cf14dd6eee (diff)
downloadscummvm-rg350-a64e8a6d30fbef1de52684b75bb6f4536b28d988.tar.gz
scummvm-rg350-a64e8a6d30fbef1de52684b75bb6f4536b28d988.tar.bz2
scummvm-rg350-a64e8a6d30fbef1de52684b75bb6f4536b28d988.zip
GOB: Hook up the MDY player in Geisha
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/init.h1
-rw-r--r--engines/gob/init_geisha.cpp7
-rw-r--r--engines/gob/inter_geisha.cpp5
3 files changed, 2 insertions, 11 deletions
diff --git a/engines/gob/init.h b/engines/gob/init.h
index 946a3fa4f1..ac460fd654 100644
--- a/engines/gob/init.h
+++ b/engines/gob/init.h
@@ -62,7 +62,6 @@ public:
~Init_Geisha();
void initVideo();
- void initGame();
};
class Init_v2 : public Init_v1 {
diff --git a/engines/gob/init_geisha.cpp b/engines/gob/init_geisha.cpp
index b5bbcff400..01081a5af6 100644
--- a/engines/gob/init_geisha.cpp
+++ b/engines/gob/init_geisha.cpp
@@ -44,11 +44,4 @@ void Init_Geisha::initVideo() {
_vm->_draw->_transparentCursor = 1;
}
-void Init_Geisha::initGame() {
- // HACK - Since the MDY/TBR player is not working, claim we have no AdLib
- _vm->_global->_soundFlags = 0;
-
- Init::initGame();
-}
-
} // End of namespace Gob
diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index 75204a3f55..8a4d4246b6 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -298,9 +298,8 @@ void Inter_Geisha::oGeisha_loadTitleMusic(OpGobParams &params) {
}
void Inter_Geisha::oGeisha_playMusic(OpGobParams &params) {
- // TODO: The MDYPlayer is still broken!
- warning("Geisha Stub: oGeisha_playMusic");
- // _vm->_sound->adlibPlay();
+ _vm->_sound->adlibSetRepeating(-1);
+ _vm->_sound->adlibPlay();
}
void Inter_Geisha::oGeisha_stopMusic(OpGobParams &params) {