aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-09-05 15:25:31 +0000
committerTravis Howell2003-09-05 15:25:31 +0000
commit8da8c277768da76efe22d89f8a244c0294f2457c (patch)
treece4683579394089f50323305ed7cd43fa3c9a1d3
parentbee5a3820aff53744243d70ecabe775b7bb1829d (diff)
downloadscummvm-rg350-8da8c277768da76efe22d89f8a244c0294f2457c.tar.gz
scummvm-rg350-8da8c277768da76efe22d89f8a244c0294f2457c.tar.bz2
scummvm-rg350-8da8c277768da76efe22d89f8a244c0294f2457c.zip
Add mac check.
svn-id: r10005
-rw-r--r--scumm/scummvm.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index e5191dce03..9db76bdd23 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -880,9 +880,8 @@ void Scumm::launch() {
if (_version < 7)
VAR(VAR_VERSION) = 21;
- if (!(_features & GF_OLD_BUNDLE && (_gameId == GID_LOOM || _gameId == GID_INDY3))) {
- // This is the for the Mac version of Indy3/Loom. TODO: add code to properly
- // distinguish the Mac version from the PC (and other) versions.
+ if (!(_features & GF_MACINTOSH) && (_version == 3)) {
+ // This is the for the Mac version of Indy3/Loom
VAR(VAR_DEBUGMODE) = _debugMode;
}
}
@@ -1141,9 +1140,8 @@ void Scumm::initScummVars() {
VAR(VAR_59) = 3;
}
- if (_features & GF_OLD_BUNDLE && (_gameId == GID_LOOM || _gameId == GID_INDY3)) {
- // This is the for the Mac version of Indy3/Loom. TODO: add code to properly
- // distinguish the Mac version from the PC (and other) versions.
+ if ((_features & GF_MACINTOSH) && (_version == 3)) {
+ // This is the for the Mac version of Indy3/Loom
VAR(39) = 320;
}
@@ -1260,9 +1258,8 @@ int Scumm::scummLoop(int delta) {
VAR(VAR_VIRT_MOUSE_Y) = _virtualMouse.y;
VAR(VAR_MOUSE_X) = _mouse.x;
VAR(VAR_MOUSE_Y) = _mouse.y;
- if (_features & GF_OLD_BUNDLE && (_gameId == GID_LOOM || _gameId == GID_INDY3)) {
- // This is the for the Mac version of Indy3/Loom. TODO: add code to properly
- // distinguish the Mac version from the PC (and other) versions.
+ if ((_features & GF_MACINTOSH) && (_version == 3)) {
+ // This is the for the Mac version of Indy3/Loom
VAR(VAR_DEBUGMODE) = _debugMode;
}
}