diff options
| -rw-r--r-- | scumm/intern.h | 10 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 16 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 14 |
3 files changed, 20 insertions, 20 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index cc3cf34c7e..9bb5ded0ec 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -407,7 +407,7 @@ protected: void o6_freezeUnfreeze(); void o6_cursorCommand(); void o6_breakHere(); - void o6_getClass(); + void o6_ifClassOfIs(); void o6_setClass(); void o6_getState(); void o6_setState(); @@ -483,11 +483,11 @@ protected: void o6_printEgo(); void o6_talkActor(); void o6_talkEgo(); - void o6_dim(); + void o6_dimArray(); void o6_dummy(); void o6_startObjectQuick(); void o6_startScriptQuick2(); - void o6_dim2dim(); + void o6_dim2dimArray(); void o6_abs(); void o6_distObjectObject(); void o6_distObjectPt(); @@ -578,8 +578,8 @@ protected: void o8_mod(); void o8_wait(); - void o8_dim(); - void o8_dim2dim(); + void o8_dimArray(); + void o8_dim2dimArray(); void o8_arrayOps(); void o8_blastText(); diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index e7c781bd85..842740e215 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -183,7 +183,7 @@ void ScummEngine_v6::setupOpcodes() { OPCODE(o6_cursorCommand), /* 6C */ OPCODE(o6_breakHere), - OPCODE(o6_getClass), + OPCODE(o6_ifClassOfIs), OPCODE(o6_setClass), OPCODE(o6_getState), /* 70 */ @@ -282,12 +282,12 @@ void ScummEngine_v6::setupOpcodes() { OPCODE(o6_talkActor), OPCODE(o6_talkEgo), /* BC */ - OPCODE(o6_dim), + OPCODE(o6_dimArray), OPCODE(o6_dummy), OPCODE(o6_startObjectQuick), OPCODE(o6_startScriptQuick2), /* C0 */ - OPCODE(o6_dim2dim), + OPCODE(o6_dim2dimArray), OPCODE(o6_invalid), OPCODE(o6_invalid), OPCODE(o6_invalid), @@ -858,7 +858,7 @@ void ScummEngine_v6::o6_breakHere() { _currentScript = 0xFF; } -void ScummEngine_v6::o6_getClass() { +void ScummEngine_v6::o6_ifClassOfIs() { int args[16]; int num, obj, cls; bool b; @@ -2260,7 +2260,7 @@ void ScummEngine_v6::o6_talkEgo() { o6_talkActor(); } -void ScummEngine_v6::o6_dim() { +void ScummEngine_v6::o6_dimArray() { int data; switch (fetchScriptByte()) { @@ -2283,7 +2283,7 @@ void ScummEngine_v6::o6_dim() { nukeArray(fetchScriptWord()); return; default: - error("o6_dim: default case"); + error("o6_dimArray: default case"); } defineArray(fetchScriptWord(), data, 0, pop()); @@ -2295,7 +2295,7 @@ void ScummEngine_v6::o6_dummy() { stopObjectCode(); } -void ScummEngine_v6::o6_dim2dim() { +void ScummEngine_v6::o6_dim2dimArray() { int a, b, data; switch (fetchScriptByte()) { case 199: // SO_INT_ARRAY @@ -2314,7 +2314,7 @@ void ScummEngine_v6::o6_dim2dim() { data = 4; break; default: - error("o6_dim2dim: default case"); + error("o6_dim2dimArray: default case"); } b = pop(); diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index ba8d3d1331..562b18c86f 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -180,12 +180,12 @@ void ScummEngine_v8::setupOpcodes() { OPCODE(o6_wordVarInc), OPCODE(o6_wordVarDec), /* 70 */ - OPCODE(o8_dim), + OPCODE(o8_dimArray), OPCODE(o6_wordArrayWrite), OPCODE(o6_wordArrayInc), OPCODE(o6_wordArrayDec), /* 74 */ - OPCODE(o8_dim2dim), + OPCODE(o8_dim2dimArray), OPCODE(o6_wordArrayIndexedWrite), OPCODE(o8_arrayOps), OPCODE(o6_invalid), @@ -300,7 +300,7 @@ void ScummEngine_v8::setupOpcodes() { OPCODE(o6_getRandomNumber), OPCODE(o6_getRandomNumberRange), /* D0 */ - OPCODE(o6_getClass), + OPCODE(o6_ifClassOfIs), OPCODE(o6_getState), OPCODE(o6_getOwner), OPCODE(o6_isScriptRunning), @@ -591,7 +591,7 @@ void ScummEngine_v8::o8_wait() { o6_breakHere(); } -void ScummEngine_v8::o8_dim() { +void ScummEngine_v8::o8_dimArray() { byte subOp = fetchScriptByte(); int array = fetchScriptWord(); @@ -606,11 +606,11 @@ void ScummEngine_v8::o8_dim() { nukeArray(array); break; default: - error("o8_dim: default case 0x%x", subOp); + error("o8_dimArray: default case 0x%x", subOp); } } -void ScummEngine_v8::o8_dim2dim() { +void ScummEngine_v8::o8_dim2dimArray() { byte subOp = fetchScriptByte(); int array = fetchScriptWord(), a, b; @@ -629,7 +629,7 @@ void ScummEngine_v8::o8_dim2dim() { nukeArray(array); break; default: - error("o8_dim2dim: default case 0x%x", subOp); + error("o8_dim2dimArray: default case 0x%x", subOp); } } |