diff options
| author | Sven Hesse | 2011-09-14 21:38:59 +0200 |
|---|---|---|
| committer | Sven Hesse | 2011-09-14 21:42:18 +0200 |
| commit | 1998ab500ea390ab5cba56ee9773d1a9b4f0b1df (patch) | |
| tree | 671dcf53e918720f0d0addd2fd3c6ad78ba39a7d | |
| parent | c6bb05594122e58ab92fc04544e1fbebfe48580f (diff) | |
| download | scummvm-rg350-1998ab500ea390ab5cba56ee9773d1a9b4f0b1df.tar.gz scummvm-rg350-1998ab500ea390ab5cba56ee9773d1a9b4f0b1df.tar.bz2 scummvm-rg350-1998ab500ea390ab5cba56ee9773d1a9b4f0b1df.zip | |
GOB: Tell Geisha that we have no AdLib
The title music is then played from SND files instead of
MDY/TBR files (that we still don't yet support).
| -rw-r--r-- | engines/gob/init.h | 1 | ||||
| -rw-r--r-- | engines/gob/init_geisha.cpp | 7 | ||||
| -rw-r--r-- | engines/gob/sound/sound.cpp | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/engines/gob/init.h b/engines/gob/init.h index ac460fd654..946a3fa4f1 100644 --- a/engines/gob/init.h +++ b/engines/gob/init.h @@ -62,6 +62,7 @@ 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 01081a5af6..b5bbcff400 100644 --- a/engines/gob/init_geisha.cpp +++ b/engines/gob/init_geisha.cpp @@ -44,4 +44,11 @@ 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/sound/sound.cpp b/engines/gob/sound/sound.cpp index e064a312c2..bfe0394390 100644 --- a/engines/gob/sound/sound.cpp +++ b/engines/gob/sound/sound.cpp @@ -434,6 +434,8 @@ void Sound::blasterPlay(SoundDesc *sndDesc, int16 repCount, debugC(1, kDebugSound, "SoundBlaster: Playing sample (%d, %d, %d)", repCount, frequency, fadeLength); + blasterStopComposition(); + _blaster->playSample(*sndDesc, repCount, frequency, fadeLength); } |