aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2004-03-02 01:01:36 +0000
committerEugene Sandulenko2004-03-02 01:01:36 +0000
commit4accb5b006f76ecd7bac63096939065ce1807bfb (patch)
treee9fc9b5ac41eaf4c3214efddc4934ca5d7177800 /scumm
parent3ca500777958142dcaa765c28a76c39c6c22c9bc (diff)
downloadscummvm-rg350-4accb5b006f76ecd7bac63096939065ce1807bfb.tar.gz
scummvm-rg350-4accb5b006f76ecd7bac63096939065ce1807bfb.tar.bz2
scummvm-rg350-4accb5b006f76ecd7bac63096939065ce1807bfb.zip
Make use of GF_WINDOWS in HE games
svn-id: r13129
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v6he.cpp2
-rw-r--r--scumm/scummvm.cpp5
2 files changed, 5 insertions, 2 deletions
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?