diff options
| -rw-r--r-- | engines/scumm/he/intern_he.h | 1 | ||||
| -rw-r--r-- | engines/scumm/he/script_v100he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v70he.cpp | 26 | ||||
| -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/he/script_v90he.cpp | 2 |
6 files changed, 5 insertions, 30 deletions
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index 0fd51d5d8d..5524b2a21e 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -159,7 +159,6 @@ protected: void o70_resourceRoutines(); void o70_systemOps(); void o70_kernelSetFunctions(); - void o70_seekFilePos(); void o70_copyString(); void o70_getStringWidth(); void o70_getStringLen(); diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 99fac87340..1e27977e0a 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -180,7 +180,7 @@ void ScummEngine_v100he::setupOpcodes() { /* 6C */ OPCODE(o72_talkEgo), OPCODE(o6_invalid), - OPCODE(o70_seekFilePos), + OPCODE(o60_seekFilePos), OPCODE(o6_setBoxFlags), /* 70 */ OPCODE(o6_invalid), diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp index fc8c0874c4..15536fe895 100644 --- a/engines/scumm/he/script_v70he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -334,7 +334,7 @@ void ScummEngine_v70he::setupOpcodes() { OPCODE(o6_invalid), /* E8 */ OPCODE(o6_invalid), - OPCODE(o70_seekFilePos), + OPCODE(o60_seekFilePos), OPCODE(o60_redimArray), OPCODE(o60_readFilePos), /* EC */ @@ -714,30 +714,6 @@ void ScummEngine_v70he::o70_systemOps() { } } -void ScummEngine_v70he::o70_seekFilePos() { - int mode, offset, slot; - mode = pop(); - offset = pop(); - slot = pop(); - - if (slot == -1) - return; - - switch (mode) { - case 1: - _hFileTable[slot].seek(offset, SEEK_SET); - break; - case 2: - _hFileTable[slot].seek(offset, SEEK_CUR); - break; - case 3: - _hFileTable[slot].seek(offset, SEEK_END); - break; - default: - error("o70_seekFilePos: default case 0x%x", mode); - } -} - void ScummEngine_v70he::o70_copyString() { int dst, size; int src = pop(); diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 58b87419fc..dea6e6a9ed 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -337,7 +337,7 @@ void ScummEngine_v72he::setupOpcodes() { OPCODE(o6_invalid), /* E8 */ OPCODE(o6_invalid), - OPCODE(o70_seekFilePos), + OPCODE(o60_seekFilePos), OPCODE(o72_redimArray), OPCODE(o60_readFilePos), /* EC */ diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index 61307c9bd7..cfcac4299a 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -334,7 +334,7 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o6_invalid), /* E8 */ OPCODE(o6_invalid), - OPCODE(o70_seekFilePos), + OPCODE(o60_seekFilePos), OPCODE(o72_redimArray), OPCODE(o60_readFilePos), /* EC */ diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index 19b80b4195..e0e023585c 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -333,7 +333,7 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o6_invalid), /* E8 */ OPCODE(o6_invalid), - OPCODE(o70_seekFilePos), + OPCODE(o60_seekFilePos), OPCODE(o72_redimArray), OPCODE(o60_readFilePos), /* EC */ |