[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.431,2.432 resource.cpp,1.307,1.308 scumm.h,1.571,1.572

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29303

Modified Files:
	intern.h resource.cpp scumm.h 
Log Message:
Pedantic cleanup

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.431
retrieving revision 2.432
diff -u -d -r2.431 -r2.432
--- intern.h	9 Apr 2005 20:22:30 -0000	2.431
+++ intern.h	9 Apr 2005 20:26:51 -0000	2.432
@@ -63,6 +63,8 @@
 	virtual void setupScummVars();
 	virtual void decodeParseString();
 
+	virtual void readMAXS(int blockSize);
+
 	int getWordVararg(int *ptr);
 	void saveVars();
 	void loadVars();

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- resource.cpp	9 Apr 2005 20:22:30 -0000	1.307
+++ resource.cpp	9 Apr 2005 20:26:51 -0000	1.308
@@ -962,7 +962,7 @@
 	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

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -d -r1.571 -r1.572
--- scumm.h	9 Apr 2005 20:22:31 -0000	1.571
+++ scumm.h	9 Apr 2005 20:26:51 -0000	1.572
@@ -726,7 +726,7 @@
 	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);