diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/gob/gob.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/gob/gob.cpp')
| -rw-r--r-- | engines/gob/gob.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 24bdb858d8..dfbff33c63 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -26,6 +26,7 @@ #include "base/plugins.h" #include "common/config-manager.h" #include "audio/mididrv.h" +#include "audio/mixer.h" #include "gui/gui-manager.h" #include "gui/dialog.h" @@ -296,9 +297,7 @@ Common::Error GobEngine::run() { if (isCD()) checkCD(); - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->open(); _global->_debugFlag = 1; _video->_doRangeClamp = true; @@ -430,6 +429,23 @@ Common::Error GobEngine::initGameParts() { _map = new Map_v1(this); _goblin = new Goblin_v1(this); _scenery = new Scenery_v1(this); + + // WORKAROUND: The EGA version of Gobliiins claims a few resources are + // larger than they actually are. The original happily reads + // past the resource structure boundary, but we don't. + // To make sure we don't throw an error like we normally do + // (which leads to these resources not loading), we enable + // this workaround that automatically fixes the resources + // sizes. + // + // This glitch is visible in levels + // - 03 (ICIGCAA) + // - 09 (ICVGCGT) + // - 16 (TCVQRPM) + // - 20 (NNGWTTO) + // See also ScummVM bug report #7162. + if (isEGA()) + _resourceSizeWorkaround = true; break; case kGameTypeGeisha: |