diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/scumm/intern.h | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/scumm/intern.h')
| -rw-r--r-- | engines/scumm/intern.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index c693787e83..2dfbcdcdbb 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -848,7 +848,7 @@ protected: byte VAR_TIMEDATE_SECOND; }; -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 class ScummEngine_v7 : public ScummEngine_v6 { friend class SmushPlayer; friend class Insane; @@ -909,6 +909,7 @@ public: void processSubtitleQueue(); void addSubtitleToQueue(const byte *text, const Common::Point &pos, byte color, byte charset); void clearSubtitleQueue(); + virtual void CHARSET_1(); protected: virtual int runDialog(Dialog &dialog); @@ -977,7 +978,6 @@ protected: virtual const char *getOpcodeDesc(byte i); virtual void printString(int m, const byte *msg); - virtual void CHARSET_1(); virtual void scummLoop_handleSaveLoad(); |