diff options
| author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
| commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
| tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /engines/gob/scenery_v1.cpp | |
| parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
| parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
| download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip | |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'engines/gob/scenery_v1.cpp')
| -rw-r--r-- | engines/gob/scenery_v1.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/gob/scenery_v1.cpp b/engines/gob/scenery_v1.cpp index 5d3eb15a95..605b098693 100644 --- a/engines/gob/scenery_v1.cpp +++ b/engines/gob/scenery_v1.cpp @@ -23,13 +23,12 @@ * */ - #include "common/endian.h" #include "gob/gob.h" #include "gob/scenery.h" #include "gob/util.h" -#include "gob/cdrom.h" +#include "gob/sound/sound.h" namespace Gob { @@ -37,11 +36,11 @@ Scenery_v1::Scenery_v1(GobEngine *vm) : Scenery(vm) { } int16 Scenery_v1::loadAnim(char search) { - if (_vm->_cdrom->_cdPlaying) { - while (_vm->_cdrom->getTrackPos() != -1) + if (_vm->_sound->cdIsPlaying()) { + while (_vm->_sound->cdGetTrackPos() != -1) _vm->_util->longDelay(50); - _vm->_cdrom->_cdPlaying = false; + _vm->_sound->cdStop(); } return Scenery::loadAnim(search); |