[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.174,1.175 scumm.h,1.325,1.326 scummvm.cpp,2.481,2.482

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3073/scumm

Modified Files:
	resource.cpp scumm.h scummvm.cpp 
Log Message:

Add PC game feature flag, to match others.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- resource.cpp	17 Nov 2003 21:16:43 -0000	1.174
+++ resource.cpp	18 Nov 2003 09:44:58 -0000	1.175
@@ -1622,7 +1622,7 @@
 
 	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;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- scumm.h	17 Nov 2003 21:16:43 -0000	1.325
+++ scumm.h	18 Nov 2003 09:44:58 -0000	1.326
@@ -94,7 +94,8 @@
 	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
 };

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.481
retrieving revision 2.482
diff -u -d -r2.481 -r2.482
--- scummvm.cpp	18 Nov 2003 02:20:12 -0000	2.481
+++ scummvm.cpp	18 Nov 2003 09:44:58 -0000	2.482
@@ -1131,7 +1131,7 @@
 		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 @@
 		game.features |= GF_MACINTOSH;
 		break;
 	default:
+		game.features |= GF_PC;
 		break;
 	}