From a35ce0f5ae4766c20e5c11949a7fd89da9b05dca Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Tue, 18 Nov 2003 09:44:58 +0000 Subject: [PATCH] Add PC game feature flag, to match others. svn-id: r11344 --- scumm/resource.cpp | 2 +- scumm/scumm.h | 3 ++- scumm/scummvm.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scumm/resource.cpp b/scumm/resource.cpp index b745827ccef..39f2ba3a59a 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -1622,7 +1622,7 @@ int ScummEngine::readSoundResourceSmallHeader(int type, int idx) { debug(4, "readSoundResourceSmallHeader(%s,%d)", resTypeFromId(type), idx); - if ((_gameId == GID_LOOM) && VAR(VAR_SOUNDCARD) == 4) { + if ((_gameId == GID_LOOM) && (_features & GF_PC) && VAR(VAR_SOUNDCARD) == 4) { // Roland resources in Loom are tagless // So we add an RO tag to allow imuse to detect format byte *ptr, *src_ptr; diff --git a/scumm/scumm.h b/scumm/scumm.h index aff1d2ad5c0..7b018375d68 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -94,7 +94,8 @@ enum GameFeatures { GF_NES = 1 << 18, GF_ATARI_ST = 1 << 19, GF_MACINTOSH = 1 << 20, - GF_DEMO = 1 << 21, + GF_PC = 1 << 21, + GF_DEMO = 1 << 22, GF_EXTERNAL_CHARSET = GF_SMALL_HEADER }; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 56fc57fd089..590b0bdb54f 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1131,7 +1131,7 @@ void ScummEngine::initScummVars() { case MD_PCJR: VAR(VAR_SOUNDCARD) = 1; break; default: if ((_gameId == GID_MONKEY_EGA || _gameId == GID_MONKEY_VGA || _gameId == GID_LOOM) - && !(_features & GF_AMIGA || _features & GF_ATARI_ST || _features & GF_MACINTOSH || _features & GF_FMTOWNS)) { + && (_features & GF_PC)) { if (_gameId == GID_LOOM) { char buf[50]; uint i = 82; @@ -2837,6 +2837,7 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { game.features |= GF_MACINTOSH; break; default: + game.features |= GF_PC; break; }