diff options
author | Max Horn | 2005-04-01 13:05:40 +0000 |
---|---|---|
committer | Max Horn | 2005-04-01 13:05:40 +0000 |
commit | 9f01b54bcfd7871f4a4a4fb58a9df65e96aae5d0 (patch) | |
tree | 474c38dcf1f306f4376b74a48d9cec404303e091 /scumm/intern.h | |
parent | 2eab3e51eb368122a80cba2f46e20f69c827755f (diff) | |
download | scummvm-rg350-9f01b54bcfd7871f4a4a4fb58a9df65e96aae5d0.tar.gz scummvm-rg350-9f01b54bcfd7871f4a4a4fb58a9df65e96aae5d0.tar.bz2 scummvm-rg350-9f01b54bcfd7871f4a4a4fb58a9df65e96aae5d0.zip |
Turned setupRoomObject into a virtual method
svn-id: r17326
Diffstat (limited to 'scumm/intern.h')
-rw-r--r-- | scumm/intern.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 539e7cce2b..ca923e6814 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -197,6 +197,16 @@ protected: void readMAXS(); void readGlobalObjects(); + + void setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr = NULL); +}; + +class ScummEngine_v4 : public ScummEngine_v3 { +public: + ScummEngine_v4(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v3(detector, syst, gs, md5sum) {} + +protected: + void loadCharset(int no); }; class ScummEngine_v2 : public ScummEngine_v3 { @@ -326,14 +336,6 @@ protected: byte VAR_BACKUP_VERB; }; -class ScummEngine_v4 : public ScummEngine_v3 { -public: - ScummEngine_v4(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v3(detector, syst, gs, md5sum) {} - -protected: - void loadCharset(int no); -}; - class ScummEngine_v6 : public ScummEngine { friend class Insane; |