aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2005-04-09 20:26:51 +0000
committerMax Horn2005-04-09 20:26:51 +0000
commitd7c1017fe449f381059bc7d19bbfc52bf838c5d4 (patch)
tree045b2c6e1394fe43cb0a2e3f68d1e9d70121431b
parent81e34e9110f88cd92227d451d153bd336a3902c1 (diff)
downloadscummvm-rg350-d7c1017fe449f381059bc7d19bbfc52bf838c5d4.tar.gz
scummvm-rg350-d7c1017fe449f381059bc7d19bbfc52bf838c5d4.tar.bz2
scummvm-rg350-d7c1017fe449f381059bc7d19bbfc52bf838c5d4.zip
Pedantic cleanup
svn-id: r17490
-rw-r--r--scumm/intern.h2
-rw-r--r--scumm/resource.cpp2
-rw-r--r--scumm/scumm.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 2bf3110fd5..7aaf4e88ca 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -63,6 +63,8 @@ protected:
virtual void setupScummVars();
virtual void decodeParseString();
+ virtual void readMAXS(int blockSize);
+
int getWordVararg(int *ptr);
void saveVars();
void loadVars();
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 5c3be0c0d6..a884f4609f 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -962,7 +962,7 @@ void ResourceManager::resourceStats() {
debug(1, "Total allocated size=%d, locked=%d(%d)", _allocatedSize, lockedSize, lockedNum);
}
-void ScummEngine::readMAXS(int blockSize) {
+void ScummEngine_v5::readMAXS(int blockSize) {
debug(9, "readMAXS: MAXS has blocksize %d", blockSize);
_numVariables = _fileHandle->readUint16LE(); // 800
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 3bd6fd9412..729e7d4266 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -726,7 +726,7 @@ protected:
virtual void loadRoomObjects();
virtual void readArrayFromIndexFile();
- virtual void readMAXS(int blockSize);
+ virtual void readMAXS(int blockSize) = 0;
virtual void readGlobalObjects();
virtual void readIndexFile();
virtual void loadCharset(int i);