diff options
| author | Eugene Sandulenko | 2004-02-23 02:07:56 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-02-23 02:07:56 +0000 |
| commit | f8781408956e8e29a34a9bddd558c3c2b6592b6f (patch) | |
| tree | 3544686c5c7d0e1a3ed779bd428912b736ed6e22 /scumm | |
| parent | 02eab2641dda74f8c327c535291949c52dea9192 (diff) | |
| download | scummvm-rg350-f8781408956e8e29a34a9bddd558c3c2b6592b6f.tar.gz scummvm-rg350-f8781408956e8e29a34a9bddd558c3c2b6592b6f.tar.bz2 scummvm-rg350-f8781408956e8e29a34a9bddd558c3c2b6592b6f.zip | |
o Add GID_FBEARPACK, previously for target fbpack GID_FBEAR was used, but there
were fbear-specific modifications which didn't apply to it. Hence another GID.
o seekFile and tellFile are enabled
svn-id: r13001
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v6he.cpp | 13 | ||||
| -rw-r--r-- | scumm/scumm.h | 3 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 8f11ea478a..92c117c09f 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -1137,7 +1137,7 @@ void ScummEngine_v6he::o6_seekFile() { offset = pop(); slot = pop(); - warning("stub o6_seekFile(%d, %d, %d)", slot, offset, mode); + debug(1, "o6_seekFile(%d, %d, %d)", slot, offset, mode); switch (mode) { case 1: @@ -1160,13 +1160,13 @@ void ScummEngine_v6he::seekWrapper(int slot, int offset, int mode) { switch (mode) { case 0: - // _hFileTable[slot].seek(offset, SEEK_SET); + _hFileTable[slot].seek(offset, SEEK_SET); break; case 1: - // _hFileTable[slot].seek(offset, SEEK_CUR); + _hFileTable[slot].seek(offset, SEEK_CUR); break; case 2: - // _hFileTable[slot].seek(offset, SEEK_END); + _hFileTable[slot].seek(offset, SEEK_END); break; } } @@ -1174,15 +1174,14 @@ void ScummEngine_v6he::seekWrapper(int slot, int offset, int mode) { void ScummEngine_v6he::o6_tellFile() { int slot = pop(); - warning("stub o6_tellFile(%d)", slot); + debug(1, "o6_tellFile(%d)", slot); if (slot == -1) { push(0); return; } - // push(_hFileTable[slot].tell()); - push(0); + push(_hFileTable[slot].pos()); } void ScummEngine_v6he::o6_redimArray() { diff --git a/scumm/scumm.h b/scumm/scumm.h index e64c033a0c..6c239d07bb 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -227,7 +227,8 @@ enum ScummGameId { GID_PUTTMOON, GID_FBEAR, GID_PJSDEMO, - GID_MONKEY_SEGA + GID_MONKEY_SEGA, + GID_FBEARPACK }; #define _baseRooms res.address[rtRoom] diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 50e4ffbac4..ee9866f0d2 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_FBEAR, 6, MDT_ADLIB | MDT_NATIVE, + {"fbpack", "Fatty Bear's Fun Pack", GID_FBEARPACK, 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}, |