diff options
author | Sven Hesse | 2007-01-05 18:16:05 +0000 |
---|---|---|
committer | Sven Hesse | 2007-01-05 18:16:05 +0000 |
commit | b30c615165e7885df3e34e71db8d65b45558deb7 (patch) | |
tree | 2bfef762c2f1edc60d090fa04b64a8da29928c86 /engines/gob/scenery_v1.cpp | |
parent | a9f62e75514b051171c88650ccdc02244812e71b (diff) | |
download | scummvm-rg350-b30c615165e7885df3e34e71db8d65b45558deb7.tar.gz scummvm-rg350-b30c615165e7885df3e34e71db8d65b45558deb7.tar.bz2 scummvm-rg350-b30c615165e7885df3e34e71db8d65b45558deb7.zip |
Fixed the loading delay bug I introduced with the playing from CD fix (#1626308)
svn-id: r25006
Diffstat (limited to 'engines/gob/scenery_v1.cpp')
-rw-r--r-- | engines/gob/scenery_v1.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/engines/gob/scenery_v1.cpp b/engines/gob/scenery_v1.cpp index e5a64f2321..5912d96100 100644 --- a/engines/gob/scenery_v1.cpp +++ b/engines/gob/scenery_v1.cpp @@ -29,12 +29,25 @@ #include "gob/anim.h" #include "gob/draw.h" #include "gob/game.h" +#include "gob/util.h" +#include "gob/cdrom.h" namespace Gob { Scenery_v1::Scenery_v1(GobEngine *vm) : Scenery(vm) { } +int16 Scenery_v1::loadAnim(char search) { + if (_vm->_cdrom->_cdPlaying) { + while (_vm->_cdrom->getTrackPos() != -1) + _vm->_util->longDelay(50); + + _vm->_cdrom->_cdPlaying = false; + } + + return Scenery::loadAnim(search); +} + // flags & 1 - do capture all area animation is occupying // flags & 4 == 0 - calculate animation final size // flags & 2 != 0 - don't check with "toRedraw"'s |