diff options
author | Nicola Mettifogo | 2007-05-01 15:39:40 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-05-01 15:39:40 +0000 |
commit | 008042ac2538bebfce013cb0ec4efa4a5600e4bb (patch) | |
tree | 3c1107a6a9323641201a6ebb11960214891c3cc9 /engines/parallaction/zone.cpp | |
parent | d520bdfcb8f70e8fd4448ea404d9e5fa993f23ca (diff) | |
download | scummvm-rg350-008042ac2538bebfce013cb0ec4efa4a5600e4bb.tar.gz scummvm-rg350-008042ac2538bebfce013cb0ec4efa4a5600e4bb.tar.bz2 scummvm-rg350-008042ac2538bebfce013cb0ec4efa4a5600e4bb.zip |
Implemented a IFF (Interchange File Format) parser and added subclasses to parse graphics (ILBM, PBM) and audio (8SVX), thus replacing old decoding routines. SAGA and Parallaction have been adjusted to work with the new code.
svn-id: r26719
Diffstat (limited to 'engines/parallaction/zone.cpp')
-rw-r--r-- | engines/parallaction/zone.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp index f3cb12f7ca..03ac70fe7d 100644 --- a/engines/parallaction/zone.cpp +++ b/engines/parallaction/zone.cpp @@ -26,6 +26,7 @@ #include "parallaction/graphics.h" #include "parallaction/inventory.h" #include "parallaction/zone.h" +#include "parallaction/music.h" namespace Parallaction { @@ -271,6 +272,10 @@ void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) { case kZoneHear: // hear Zone init if (!scumm_stricmp(_tokens[0], "sound")) { strcpy(u->hear->_name, _tokens[1]); + z->u.hear->_channel = atoi(_tokens[2]); + } + if (!scumm_stricmp(_tokens[0], "freq")) { + z->u.hear->_freq = atoi(_tokens[1]); } break; @@ -400,7 +405,7 @@ uint16 Parallaction::runZone(Zone *z) { break; case kZoneHear: - strcpy(_soundFile, z->u.hear->_name); + _soundMan->playSfx(z->u.hear->_name, z->u.hear->_channel, (z->_flags & kFlagsLooping) == kFlagsLooping, 60); break; case kZoneSpeak: |