ScummEngine_v4 used to be a subclass of ScummEngine_v3, now it is the other way around; added a new class ScummEngine_v3old, for GF_OLD_BUNDLE games; took advantage of the new inheritance structure and turned various methods into virtual methods which then are overriden in subclasses

svn-id: r17346

1 files changed, 2 insertions, 4 deletions

diff --git a/scumm/scumm.h b/scumm/scumm.h
index 6806f2039d..cca3416350 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -689,11 +689,9 @@ protected:
 	void convertADResource(int type, int index, byte *ptr, int size);
 	int readSoundResourceSmallHeader(int type, int index);
 	bool isResourceInUse(int type, int i) const;
-	void initRoomSubBlocks();
+	virtual void initRoomSubBlocks();
 	void clearRoomObjects();
-	void loadRoomObjects();
-	void loadRoomObjectsSmall();
-	void loadRoomObjectsOldBundle();
+	virtual void loadRoomObjects();
 
 	virtual void readArrayFromIndexFile();
 	virtual void readMAXS(int blockSize);