thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add PC game feature flag, to match others.

Browse source 
svn-id: r11344
This commit is contained in:
Travis Howell 2003-11-18 09:44:58 +00:00
parent 022facfbce
commit a35ce0f5ae
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/resource.cpp
View file

@ -1622,7 +1622,7 @@ int ScummEngine::readSoundResourceSmallHeader(int type, int idx) {
debug(4, "readSoundResourceSmallHeader(%s,%d)", resTypeFromId(type), 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 // Roland resources in Loom are tagless
// So we add an RO tag to allow imuse to detect format // So we add an RO tag to allow imuse to detect format
byte *ptr, *src_ptr; byte *ptr, *src_ptr;

3
scumm/scumm.h
View file

@ -94,7 +94,8 @@ enum GameFeatures {
GF_NES = 1 << 18, GF_NES = 1 << 18,
GF_ATARI_ST = 1 << 19, GF_ATARI_ST = 1 << 19,
GF_MACINTOSH = 1 << 20, GF_MACINTOSH = 1 << 20,
GF_DEMO = 1 << 21, GF_PC = 1 << 21,
GF_DEMO = 1 << 22,
GF_EXTERNAL_CHARSET = GF_SMALL_HEADER GF_EXTERNAL_CHARSET = GF_SMALL_HEADER
}; };

3
scumm/scummvm.cpp
View file

@ -1131,7 +1131,7 @@ void ScummEngine::initScummVars() {
case MD_PCJR: VAR(VAR_SOUNDCARD) = 1; break; case MD_PCJR: VAR(VAR_SOUNDCARD) = 1; break;
default: default:
if ((_gameId == GID_MONKEY_EGA || _gameId == GID_MONKEY_VGA || _gameId == GID_LOOM) 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) { if (_gameId == GID_LOOM) {
char buf[50]; char buf[50];
uint i = 82; uint i = 82;
@ -2837,6 +2837,7 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
game.features |= GF_MACINTOSH; game.features |= GF_MACINTOSH;
break; break;
default: default:
game.features |= GF_PC;
break; break;
} }