diff options
author | Max Horn | 2005-04-03 15:06:08 +0000 |
---|---|---|
committer | Max Horn | 2005-04-03 15:06:08 +0000 |
commit | b507231f7135f0af2a27b047f1982685736e0e7b (patch) | |
tree | 433e1dca1aa39631e819bad11fd2a08aa0aa1dc8 /scumm/scumm.h | |
parent | f63b35381b4b8e50cefb08103498dc195e38c29b (diff) | |
download | scummvm-rg350-b507231f7135f0af2a27b047f1982685736e0e7b.tar.gz scummvm-rg350-b507231f7135f0af2a27b047f1982685736e0e7b.tar.bz2 scummvm-rg350-b507231f7135f0af2a27b047f1982685736e0e7b.zip |
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
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 6 |
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); |