diff options
| author | Travis Howell | 2005-10-19 09:43:13 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-10-19 09:43:13 +0000 |
| commit | d91fc4c2267f3b02bbea1baf7b351a20768a2605 (patch) | |
| tree | e5cf85e2a70bf0c0d325801cad451ce0c51bd05e | |
| parent | a5e95b89c6a2aecca5dc78b637046e2c4838a20c (diff) | |
| download | scummvm-rg350-d91fc4c2267f3b02bbea1baf7b351a20768a2605.tar.gz scummvm-rg350-d91fc4c2267f3b02bbea1baf7b351a20768a2605.tar.bz2 scummvm-rg350-d91fc4c2267f3b02bbea1baf7b351a20768a2605.zip | |
Add missing opcode in HE100 table.
Rename opcode.
svn-id: r19174
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/script_v100he.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 6 | ||||
| -rw-r--r-- | scumm/script_v80he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 96caa2a105..6b649b749f 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -1009,7 +1009,7 @@ protected: void o72_captureWizImage(); void o72_getTimer(); void o72_setTimer(); - void o72_getSoundElapsedTime(); + void o72_getSoundPosition(); void o72_startScript(); void o72_startObject(); void o72_drawObject(); diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index dc5943f889..588fe66274 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -59,7 +59,7 @@ void ScummEngine_v100he::setupOpcodes() { OPCODE(o6_loadRoom), OPCODE(o6_panCameraTo), /* 10 */ - OPCODE(o6_invalid), + OPCODE(o72_captureWizImage), OPCODE(o100_jumpToScript), OPCODE(o6_setClass), OPCODE(o60_closeFile), @@ -309,7 +309,7 @@ void ScummEngine_v100he::setupOpcodes() { OPCODE(o6_isScriptRunning), OPCODE(o90_sin), /* D8 */ - OPCODE(o72_getSoundElapsedTime), + OPCODE(o72_getSoundPosition), OPCODE(o6_isSoundRunning), OPCODE(o80_getSoundVar), OPCODE(o100_getSpriteInfo), diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 9a393d3eaa..e7e42d63f4 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_getSoundElapsedTime), + OPCODE(o72_getSoundPosition), OPCODE(o6_wordArrayDec), /* 5C */ OPCODE(o6_if), @@ -886,10 +886,10 @@ void ScummEngine_v72he::o72_setTimer() { } } -void ScummEngine_v72he::o72_getSoundElapsedTime() { +void ScummEngine_v72he::o72_getSoundPosition() { int snd = pop(); push(_sound->getSoundElapsedTime(snd) * 10); - debug(1,"o72_getSoundElapsedTime (%d)", snd); + debug(1,"o72_getSoundPosition (%d)", snd); } void ScummEngine_v72he::o72_startScript() { diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index fe482444c6..5503c326c0 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -155,7 +155,7 @@ void ScummEngine_v80he::setupOpcodes() { /* 58 */ OPCODE(o72_getTimer), OPCODE(o72_setTimer), - OPCODE(o72_getSoundElapsedTime), + OPCODE(o72_getSoundPosition), OPCODE(o6_wordArrayDec), /* 5C */ OPCODE(o6_if), diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 33c9e7784b..e815d5f218 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -152,7 +152,7 @@ void ScummEngine_v90he::setupOpcodes() { /* 58 */ OPCODE(o72_getTimer), OPCODE(o72_setTimer), - OPCODE(o72_getSoundElapsedTime), + OPCODE(o72_getSoundPosition), OPCODE(o6_wordArrayDec), /* 5C */ OPCODE(o6_if), |