diff options
| author | Travis Howell | 2009-06-03 06:24:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-06-03 06:24:27 +0000 |
| commit | ba48060b5f856fed6e2b8d6e899a8b591e0ee3c0 (patch) | |
| tree | 6fb1a3adf064322ebe31a5dc3e70a1bfdc205ca8 | |
| parent | a34fb64f09691ed631867f72f313b1d7dcae3bde (diff) | |
| download | scummvm-rg350-ba48060b5f856fed6e2b8d6e899a8b591e0ee3c0.tar.gz scummvm-rg350-ba48060b5f856fed6e2b8d6e899a8b591e0ee3c0.tar.bz2 scummvm-rg350-ba48060b5f856fed6e2b8d6e899a8b591e0ee3c0.zip | |
Sprites are used for subtitles, in all 16bit color HE games.
svn-id: r41133
| -rw-r--r-- | engines/scumm/detection_tables.h | 10 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 5 | ||||
| -rw-r--r-- | engines/scumm/string.cpp | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index c7aed924e1..60c9837bb4 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -339,14 +339,14 @@ static const GameSettings gameVariantsTable[] = { // Added 16bit color {"baseball2001", 0, 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK}, {"SoccerMLS", 0, 0, GID_SOCCER, 6, 99, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, - {"spyozon", 0, 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, + {"spyozon", 0, 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, - {"freddicove", "", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, - {"freddicove", "unenc", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, - {"freddicove", "HE 100", 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, + {"freddicove", "", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, + {"freddicove", "unenc", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, + {"freddicove", "HE 100", 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, // Restructured the Scumm engine - {"pjgames", 0, 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, + {"pjgames", 0, 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, // Uses smacker in external files, for testing only {"arttime", 0, 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK}, diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 7453198782..ff3852ee83 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -124,10 +124,7 @@ enum GameFeatures { GF_HE_985 = 1 << 14, /** HE games with 16 bit color */ - GF_16BIT_COLOR = 1 << 15, - - /** HE games which use sprites for subtitles */ - GF_HE_NOSUBTITLES = 1 << 16 + GF_16BIT_COLOR = 1 << 15 }; /* SCUMM Debug Channels */ diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 77fad53425..d40bbb9aaa 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -635,7 +635,7 @@ void ScummEngine::CHARSET_1() { if (_game.version <= 3) { _charset->printChar(c, false); } else { - if (_game.features & GF_HE_NOSUBTITLES) { + if (_game.features & GF_16BIT_COLOR) { // HE games which use sprites for subtitles } else if (_game.heversion >= 60 && !ConfMan.getBool("subtitles") && _sound->isSoundRunning(1)) { // Special case for HE games |