diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/tinsel/tinsel.h | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/tinsel/tinsel.h')
| -rw-r--r-- | engines/tinsel/tinsel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index df27a1e0e1..ed70979349 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -74,13 +74,14 @@ enum TinselGameFeatures { GF_FLOPPY = 1 << 2, GF_SCNFILES = 1 << 3, GF_ENHANCED_AUDIO_SUPPORT = 1 << 4, + GF_ALT_MIDI = 1 << 5, // Alternate sequence in midi.dat file // The GF_USE_?FLAGS values specify how many country flags are displayed // in the subtitles options dialog. // None of these defined -> 1 language, in ENGLISH.TXT - GF_USE_3FLAGS = 1 << 5, // French, German, Spanish - GF_USE_4FLAGS = 1 << 6, // French, German, Spanish, Italian - GF_USE_5FLAGS = 1 << 7 // All 5 flags + GF_USE_3FLAGS = 1 << 6, // French, German, Spanish + GF_USE_4FLAGS = 1 << 7, // French, German, Spanish, Italian + GF_USE_5FLAGS = 1 << 8 // All 5 flags }; /** @@ -169,7 +170,6 @@ protected: #if 0 bool canSaveGameStateCurrently(); #endif - virtual void syncSoundSettings(); public: TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc); |