From b507231f7135f0af2a27b047f1982685736e0e7b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 3 Apr 2005 15:06:08 +0000 Subject: 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 --- scumm/scumm.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scumm/scumm.h') 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); -- cgit v1.2.3