aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-09-13 13:59:46 +0000
committerMax Horn2003-09-13 13:59:46 +0000
commitb6e4fb2ef788f5e286017a87bfad4170c1999735 (patch)
tree372d779aebfeaa8f9d9c3b0fba5da7e40e084330 /scumm
parentc334c1103fbb927d4826bcafd89a71fa7391a093 (diff)
downloadscummvm-rg350-b6e4fb2ef788f5e286017a87bfad4170c1999735.tar.gz
scummvm-rg350-b6e4fb2ef788f5e286017a87bfad4170c1999735.tar.bz2
scummvm-rg350-b6e4fb2ef788f5e286017a87bfad4170c1999735.zip
since _hFileTable is only used by Scumm_v6, there is no reason to put it into class Scumm
svn-id: r10227
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h3
-rw-r--r--scumm/script_v6.cpp2
-rw-r--r--scumm/scumm.h1
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 88a2dbfea4..4f947e3f7c 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -317,7 +317,8 @@ protected:
};
const OpcodeEntryV6 *_opcodesV6;
-
+
+ File _hFileTable[17];
public:
Scumm_v6(GameDetector *detector, OSystem *syst) : Scumm(detector, syst)
{
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 4241b27ae0..51ca862615 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2371,7 +2371,7 @@ void Scumm_v6::o6_setBlastObjectWindow() {
b = pop();
a = pop();
- warning("o6_bompWindow(%d, %d, %d, %d)", a, b, c, d);
+ warning("o6_setBlastObjectWindow(%d, %d, %d, %d)", a, b, c, d);
// sub_274EF(a, b, c, d);
}
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 0b8f760f78..c5869f4835 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -559,7 +559,6 @@ protected:
/* Should be in Resource class */
File _fileHandle;
uint32 _fileOffset;
- File _hFileTable[17];
int _resourceHeaderSize;
char *_exe_name; // This is the name we use for opening resource files
char *_game_name; // This is the game the user calls it, so use for saving