diff options
| author | Travis Howell | 2005-04-04 11:43:25 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-04 11:43:25 +0000 |
| commit | f230fe65e8b035d3bcbf3a45317cf56ac673fdfe (patch) | |
| tree | 6de886f11751b849dfec6de3b695cd5410efba1d /scumm/script_v72he.cpp | |
| parent | d08068dff1ea02314d791c1248d72091d4d5d9e9 (diff) | |
| download | scummvm-rg350-f230fe65e8b035d3bcbf3a45317cf56ac673fdfe.tar.gz scummvm-rg350-f230fe65e8b035d3bcbf3a45317cf56ac673fdfe.tar.bz2 scummvm-rg350-f230fe65e8b035d3bcbf3a45317cf56ac673fdfe.zip | |
Add 8 sound channel support for HE games
-Allows sound looping to work
Added support for WAVE format musuc used in later HE100 games.
svn-id: r17372
Diffstat (limited to 'scumm/script_v72he.cpp')
| -rw-r--r-- | scumm/script_v72he.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index e3a141f9e6..cb364fe0f0 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -156,7 +156,7 @@ void ScummEngine_v72he::setupOpcodes() { /* 58 */ OPCODE(o72_getTimer), OPCODE(o72_setTimer), - OPCODE(o72_getSoundElapsedTimeOfSound), + OPCODE(o72_getSoundElapsedTime), OPCODE(o6_wordArrayDec), /* 5C */ OPCODE(o6_if), @@ -562,6 +562,7 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) { switch(chr) { case 'b': // byte + error("decodeScriptString: byte unhandled"); break; case 'c': *dst++ = args[val--]; @@ -574,6 +575,7 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) { break; case 'x': // hexadecimal + error("decodeScriptString: hexadecimal unhandled"); break; default: error("decodeScriptString: Unknown type %d", chr); @@ -811,10 +813,10 @@ void ScummEngine_v72he::o72_setTimer() { } } -void ScummEngine_v72he::o72_getSoundElapsedTimeOfSound() { +void ScummEngine_v72he::o72_getSoundElapsedTime() { int snd = pop(); - push(_mixer->getSoundElapsedTimeOfSoundID(snd) * 10); - debug(1,"o72_getSoundElapsedTimeOfSound (%d)", snd); + push(_sound->getSoundElapsedTime(snd) * 10); + debug(1,"o72_getSoundElapsedTime (%d)", snd); } void ScummEngine_v72he::o72_startScript() { |