diff options
author | Travis Howell | 2004-02-24 00:43:01 +0000 |
---|---|---|
committer | Travis Howell | 2004-02-24 00:43:01 +0000 |
commit | 10f95809ab80f0d108a9abe45bac1de63117cfa5 (patch) | |
tree | a1ad1684cf75b70bccfa04779475336eac583221 | |
parent | 87438d54177e3b644769f785442161c222005380 (diff) | |
download | scummvm-rg350-10f95809ab80f0d108a9abe45bac1de63117cfa5.tar.gz scummvm-rg350-10f95809ab80f0d108a9abe45bac1de63117cfa5.tar.bz2 scummvm-rg350-10f95809ab80f0d108a9abe45bac1de63117cfa5.zip |
Rename a few opcodes
svn-id: r13011
-rw-r--r-- | scumm/intern.h | 10 | ||||
-rw-r--r-- | scumm/script_v6he.cpp | 16 | ||||
-rw-r--r-- | scumm/scumm.h | 2 | ||||
-rw-r--r-- | scumm/scummvm.cpp | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 926053bd98..f35638ad7b 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -562,6 +562,9 @@ protected: void redimArray(int arrayId, int newX, int newY, int d); int readFileToArray(int slot, int32 size); void writeFileFromArray(int slot, int resID); + int kernelGetFunctions1(byte *addr, int arg1, int arg2, int arg3, int agr4); + void kernelSetFunctions1(byte *addr); + void seekFilePos(int slot, int offset, int mode); /* Version 6 script opcodes */ void o6_drawBlastObject(); @@ -584,17 +587,14 @@ protected: void o6_rename(); void o6_writeFile(); void o6_setVolume(); - void o6_seekFile(); + void o6_seekFilePos(); void o6_localizeArray(); void o6_unknownEE(); void o6_unknownFA(); void o6_redimArray(); void o6_readINI(); void o6_unknownF9(); - void o6_tellFile(); - void kernelSetFunctions1(byte *addr); - int kernelGetFunctions1(byte *addr, int arg1, int arg2, int arg3, int agr4); - void seekWrapper(int slot, int offset, int mode); + void o6_readFilePos(); }; class ScummEngine_v7 : public ScummEngine_v6 { diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index b053783caf..a0118ba2d1 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -338,9 +338,9 @@ void ScummEngine_v6he::setupOpcodes() { OPCODE(o6_invalid), /* E8 */ OPCODE(o6_invalid), - OPCODE(o6_seekFile), + OPCODE(o6_seekFilePos), OPCODE(o6_redimArray), - OPCODE(o6_tellFile), + OPCODE(o6_readFilePos), /* EC */ OPCODE(o6_invalid), OPCODE(o6_invalid), @@ -1132,7 +1132,7 @@ void ScummEngine_v6he::o6_unknownFA() { _scriptPointer += len + 1; } -void ScummEngine_v6he::o6_seekFile() { +void ScummEngine_v6he::o6_seekFilePos() { int mode, offset, slot; mode = pop(); offset = pop(); @@ -1142,20 +1142,20 @@ void ScummEngine_v6he::o6_seekFile() { switch (mode) { case 1: - seekWrapper(slot, offset, 0); + seekFilePos(slot, offset, 0); break; case 2: - seekWrapper(slot, offset, 1); + seekFilePos(slot, offset, 1); break; case 3: - seekWrapper(slot, offset, 2); + seekFilePos(slot, offset, 2); break; default: break; } } -void ScummEngine_v6he::seekWrapper(int slot, int offset, int mode) { +void ScummEngine_v6he::seekFilePos(int slot, int offset, int mode) { if (slot == 1) return; @@ -1172,7 +1172,7 @@ void ScummEngine_v6he::seekWrapper(int slot, int offset, int mode) { } } -void ScummEngine_v6he::o6_tellFile() { +void ScummEngine_v6he::o6_readFilePos() { int slot = pop(); debug(1, "o6_tellFile(%d)", slot); diff --git a/scumm/scumm.h b/scumm/scumm.h index 6c239d07bb..3f9301aeaf 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -228,7 +228,7 @@ enum ScummGameId { GID_FBEAR, GID_PJSDEMO, GID_MONKEY_SEGA, - GID_FBEARPACK + GID_FBPACK }; #define _baseRooms res.address[rtRoom] diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index ee9866f0d2..bc180efac8 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -164,7 +164,7 @@ static const ScummGameSettings scumm_settings[] = { GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"fbpack", "Fatty Bear's Fun Pack", GID_FBEARPACK, 6, MDT_ADLIB | MDT_NATIVE, + {"fbpack", "Fatty Bear's Fun Pack", GID_FBPACK, 6, MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, |