diff options
| -rw-r--r-- | engines/scumm/he/script_v60he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v70he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v80he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/intern.h | 2 | ||||
| -rw-r--r-- | engines/scumm/script_v6.cpp | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 7c6cd10711..12a4b1c258 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -279,7 +279,7 @@ void ScummEngine_v60he::setupOpcodes() { OPCODE(o6_getActorWidth), OPCODE(o6_wait), OPCODE(o6_getActorScaleX), - OPCODE(o6_getActorAnimCounter1), + OPCODE(o6_getActorAnimCounter), /* AC */ OPCODE(o6_invalid), OPCODE(o6_isAnyOf), diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp index 71a43c1a42..16c3d7e4d1 100644 --- a/engines/scumm/he/script_v70he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -256,7 +256,7 @@ void ScummEngine_v70he::setupOpcodes() { OPCODE(o6_getActorWidth), OPCODE(o6_wait), OPCODE(o6_getActorScaleX), - OPCODE(o6_getActorAnimCounter1), + OPCODE(o6_getActorAnimCounter), /* AC */ OPCODE(o6_invalid), OPCODE(o6_isAnyOf), diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index cbd68a20e9..22ff50476a 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -259,7 +259,7 @@ void ScummEngine_v72he::setupOpcodes() { OPCODE(o6_getActorWidth), OPCODE(o6_wait), OPCODE(o6_getActorScaleX), - OPCODE(o6_getActorAnimCounter1), + OPCODE(o6_getActorAnimCounter), /* AC */ OPCODE(o6_invalid), OPCODE(o6_isAnyOf), diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index b7d689c069..6ede98b2ec 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -256,7 +256,7 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o6_getActorWidth), OPCODE(o6_wait), OPCODE(o6_getActorScaleX), - OPCODE(o6_getActorAnimCounter1), + OPCODE(o6_getActorAnimCounter), /* AC */ OPCODE(o80_drawWizPolygon), OPCODE(o6_isAnyOf), diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index 0bf8b9b67e..347729ea60 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -750,7 +750,7 @@ protected: void o6_getActorWidth(); void o6_wait(); void o6_getActorScaleX(); - void o6_getActorAnimCounter1(); + void o6_getActorAnimCounter(); void o6_soundKludge(); void o6_isAnyOf(); void o6_systemOps(); diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 9b2815a697..b6fed34c9c 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -263,7 +263,7 @@ void ScummEngine_v6::setupOpcodes() { OPCODE(o6_getActorWidth), OPCODE(o6_wait), OPCODE(o6_getActorScaleX), - OPCODE(o6_getActorAnimCounter1), + OPCODE(o6_getActorAnimCounter), /* AC */ OPCODE(o6_soundKludge), OPCODE(o6_isAnyOf), @@ -1434,11 +1434,11 @@ void ScummEngine_v6::o6_getActorWidth() { } void ScummEngine_v6::o6_getActorScaleX() { - Actor *a = derefActor(pop(), "o6_getActorScale"); + Actor *a = derefActor(pop(), "o6_getActorScaleX"); push(a->_scalex); } -void ScummEngine_v6::o6_getActorAnimCounter1() { +void ScummEngine_v6::o6_getActorAnimCounter() { Actor *a = derefActor(pop(), "o6_getActorAnimCounter"); push(a->_cost.animCounter); } |