From 4accb5b006f76ecd7bac63096939065ce1807bfb Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 2 Mar 2004 01:01:36 +0000
Subject: Make use of GF_WINDOWS in HE games

svn-id: r13129
---
 scumm/script_v6he.cpp | 2 +-
 scumm/scummvm.cpp     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 9f166a6dd6..73d737857a 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -1248,7 +1248,7 @@ void ScummEngine_v6he::redimArray(int arrayId, int newX, int newY, int type) {
 void ScummEngine_v6he::o6_stringLen() {
 	int a, len;
 
-	if (_gameId == GID_PUTTPUTT) {
+	if (_features & GF_PC) {
 		o6_invalid();
 	}
 
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 8fd397d524..486556465b 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -654,7 +654,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 	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 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
 	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?
-- 
cgit v1.2.3