[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.32,2.33 scummvm.cpp,2.601,2.602

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26270

Modified Files:
	script_v6he.cpp scummvm.cpp 
Log Message:
Make use of GF_WINDOWS in HE games


Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- script_v6he.cpp	2 Mar 2004 00:23:25 -0000	2.32
+++ script_v6he.cpp	2 Mar 2004 01:01:36 -0000	2.33
@@ -1248,7 +1248,7 @@
 void ScummEngine_v6he::o6_stringLen() {
 	int a, len;
 
-	if (_gameId == GID_PUTTPUTT) {
+	if (_features & GF_PC) {
 		o6_invalid();
 	}
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.601
retrieving revision 2.602
diff -u -d -r2.601 -r2.602
--- scummvm.cpp	2 Mar 2004 00:21:02 -0000	2.601
+++ scummvm.cpp	2 Mar 2004 01:01:36 -0000	2.602
@@ -654,7 +654,7 @@
 	if (_features & GF_FMTOWNS) {	// FMTowns V3 games use 320x240
 		_screenWidth = 320;
 		_screenHeight = 240;
-	} else if ((_gameId == GID_CMI) || (_features & GF_AFTER_HEV7)) {
+	} else if ((_gameId == GID_CMI) || (_features & GF_WINDOWS)) {
 		_screenWidth = 640;
 		_screenHeight = 480;
 	} else if (_features & GF_NES) {
@@ -2930,6 +2930,9 @@
 	case Common::kPlatformMacintosh:
 		game.features |= GF_MACINTOSH;
 		break;
+	case Common::kPlatformWindows:
+		game.features |= GF_WINDOWS;
+		break;
 	case Common::kPlatformFMTowns:
 		if (game.version == 3) {
 			// The V5 FM-TOWNS games are mostly identical to the PC versions, it seems?