aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-01-30 02:00:24 +0000
committerTravis Howell2005-01-30 02:00:24 +0000
commit399dcad5bdb08193e3e384ef8d999daae1dde17b (patch)
treef7e8809363d9940258db9abb8fd268d1ac6fb9eb /scumm
parent3c1934cc8ffbe3f80f7aae56dbf39c71e2cbb85e (diff)
downloadscummvm-rg350-399dcad5bdb08193e3e384ef8d999daae1dde17b.tar.gz
scummvm-rg350-399dcad5bdb08193e3e384ef8d999daae1dde17b.tar.bz2
scummvm-rg350-399dcad5bdb08193e3e384ef8d999daae1dde17b.zip
Skip cursors in Macintosh version of HE72 games for now.
Add early Macintosh HE games. svn-id: r16698
Diffstat (limited to 'scumm')
-rw-r--r--scumm/cursor.cpp4
-rw-r--r--scumm/scumm.cpp3
2 files changed, 7 insertions, 0 deletions
diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp
index 5d321c1706..4a96da63b7 100644
--- a/scumm/cursor.cpp
+++ b/scumm/cursor.cpp
@@ -144,6 +144,10 @@ void ScummEngine::setCursorFromBuffer(byte *ptr, int width, int height, int pitc
}
void ScummEngine_v70he::setCursorFromImg(uint img, uint room, uint imgindex) {
+ // HACK Macintosh cursors aren't supported yet.
+ if (_features & GF_MACINTOSH && _heversion == 72)
+ return;
+
_win32ResExtractor->setCursor(img);
}
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 5b91094454..8e1fc52648 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -442,6 +442,7 @@ static struct heMacFileNames {
{ "f3-mdemo", "F3-Mdemo", true },
{ "f4-demo", "Freddi 4 Demo", true },
{ "farmdemo", "Farm Demo", true},
+ { "fbear", "Fatty Bear", false },
{ "fbdemo", "Fatty Bear Demo", false },
{ "ff2-demo", "Freddi Fish 2 Demo", true },
{ "ffhsdemo", "FFHSDemo", true },
@@ -466,6 +467,8 @@ static struct heMacFileNames {
{ "pjsamdemo", "PjSamDemo", true },
{ "circdemo", "Putt Circus Demo", true },
{ "puttdemo", "Putt-Putt's Demo", false },
+ { "puttmoon", "Putt-Putt Moon", false },
+ { "puttputt", "Putt-Putt Parade", false },
{ "PuttsFunShop", "Putt's FunShop", true },
{ "putttime-demo", "TimeDemo", true },
{ "puttzoo", "PuttZoo", true },