diff options
| author | Travis Howell | 2004-10-08 07:13:13 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-10-08 07:13:13 +0000 |
| commit | 59be342467a9f0437d5d8a0c20f209855b015c99 (patch) | |
| tree | 72378c5b116d9a417aeb76b9d68f175bdbbfe424 /scumm | |
| parent | aaa5ccae771a2dec9288b87a1c38bcea540d02e0 (diff) | |
| download | scummvm-rg350-59be342467a9f0437d5d8a0c20f209855b015c99.tar.gz scummvm-rg350-59be342467a9f0437d5d8a0c20f209855b015c99.tar.bz2 scummvm-rg350-59be342467a9f0437d5d8a0c20f209855b015c99.zip | |
Match opcode names with SCUMM8.
svn-id: r15466
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/intern.h | 4 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 8 | ||||
| -rw-r--r-- | scumm/script_v80he.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 42519bf78f..303dcfb7a1 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -730,8 +730,8 @@ protected: void o72_unknown50(); void o72_findObjectWithClassOf(); void o72_wordArrayInc(); - void o72_objectX(); - void o72_objectY(); + void o72_getObjectImageX(); + void o72_getObjectImageY(); void o72_unknown56(); void o72_getTimer(); void o72_setTimer(); diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 64b10096c7..805667e9d4 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -150,8 +150,8 @@ void ScummEngine_v72he::setupOpcodes() { OPCODE(o72_findObjectWithClassOf), OPCODE(o72_wordArrayInc), /* 54 */ - OPCODE(o72_objectX), - OPCODE(o72_objectY), + OPCODE(o72_getObjectImageX), + OPCODE(o72_getObjectImageY), OPCODE(o72_unknown56), OPCODE(o6_wordVarDec), /* 58 */ @@ -753,7 +753,7 @@ void ScummEngine_v72he::o72_wordArrayDec() { writeArray(var, 0, base, readArray(var, 0, base) - 1); } -void ScummEngine_v72he::o72_objectX() { +void ScummEngine_v72he::o72_getObjectImageX() { int object = pop(); int objnum = getObjectIndex(object); @@ -766,7 +766,7 @@ void ScummEngine_v72he::o72_objectX() { } -void ScummEngine_v72he::o72_objectY() { +void ScummEngine_v72he::o72_getObjectImageY() { int object = pop(); int objnum = getObjectIndex(object); diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index 486def2e0f..8bbeda748a 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -149,8 +149,8 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o72_findObjectWithClassOf), OPCODE(o72_wordArrayInc), /* 54 */ - OPCODE(o72_objectX), - OPCODE(o72_objectY), + OPCODE(o72_getObjectImageX), + OPCODE(o72_getObjectImageY), OPCODE(o72_unknown56), OPCODE(o6_wordVarDec), /* 58 */ diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index e232cc9ea5..b800e9fdf5 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -149,8 +149,8 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o72_findObjectWithClassOf), OPCODE(o72_wordArrayInc), /* 54 */ - OPCODE(o72_objectX), - OPCODE(o72_objectY), + OPCODE(o72_getObjectImageX), + OPCODE(o72_getObjectImageY), OPCODE(o72_unknown56), OPCODE(o6_wordVarDec), /* 58 */ |