diff options
| author | Sven Hesse | 2006-01-08 20:03:20 +0000 |
|---|---|---|
| committer | Sven Hesse | 2006-01-08 20:03:20 +0000 |
| commit | 70dfe93ed707a5d1cb9dc45257cc51c7e4228b8f (patch) | |
| tree | f76bd2c53168bfb6c8ede005bb1854daca8b6f4f /gob/inter_v1.cpp | |
| parent | c19447b45f0f6a339c48f3cfe7bcf178fcfb14bf (diff) | |
| download | scummvm-rg350-70dfe93ed707a5d1cb9dc45257cc51c7e4228b8f.tar.gz scummvm-rg350-70dfe93ed707a5d1cb9dc45257cc51c7e4228b8f.tar.bz2 scummvm-rg350-70dfe93ed707a5d1cb9dc45257cc51c7e4228b8f.zip | |
Added a dummy table for which music to play in Gobliiins Mac; some code formating issues
svn-id: r19951
Diffstat (limited to 'gob/inter_v1.cpp')
| -rw-r--r-- | gob/inter_v1.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gob/inter_v1.cpp b/gob/inter_v1.cpp index eeb8ef218c..15c28be3bb 100644 --- a/gob/inter_v1.cpp +++ b/gob/inter_v1.cpp @@ -30,6 +30,7 @@ #include "gob/mult.h" #include "gob/goblin.h" #include "gob/cdrom.h" +#include "gob/music.h" namespace Gob { @@ -1358,9 +1359,12 @@ void Inter_v1::o1_loadCurLayer(void) { } void Inter_v1::o1_playCDTrack(void) { - // Used in gob1 CD evalExpr(0); - _vm->_cdrom->startTrack(_vm->_global->_inter_resStr); + if (_vm->_features & GF_MAC) + _vm->_music->playTrack(_vm->_global->_inter_resStr); + else + // Used in gob1 CD + _vm->_cdrom->startTrack(_vm->_global->_inter_resStr); } void Inter_v1::o1_getCDTrackPos(void) { @@ -1379,8 +1383,11 @@ void Inter_v1::o1_getCDTrackPos(void) { } void Inter_v1::o1_stopCD(void) { - // Used in gob1 CD - _vm->_cdrom->stopPlaying(); + if (_vm->_features & GF_MAC) + _vm->_music->stopPlay(); + else + // Used in gob1 CD + _vm->_cdrom->stopPlaying(); } void Inter_v1::o1_loadFontToSprite(void) { |