aboutsummaryrefslogtreecommitdiff
path: root/scumm/cursor.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-01-31 03:53:35 +0000
committerEugene Sandulenko2005-01-31 03:53:35 +0000
commitc32e93672363c2b38b1a636498ce7930864d25e1 (patch)
tree4b5017bd075e332e4f02a252e6173338a89d7b9d /scumm/cursor.cpp
parent0c827c0fcf43a764f0e9176d23ccf4567282934a (diff)
downloadscummvm-rg350-c32e93672363c2b38b1a636498ce7930864d25e1.tar.gz
scummvm-rg350-c32e93672363c2b38b1a636498ce7930864d25e1.tar.bz2
scummvm-rg350-c32e93672363c2b38b1a636498ce7930864d25e1.zip
Support for Mac cursors.
TODO: o Allow reading from non-processed game executable. Now you need to get .bin file out of it o Use color versions of cursors o Combine MacResExtractor with Win32ResExtractor. Now I just stupidly create 2 objects and do not use new cursor caching code. svn-id: r16713
Diffstat (limited to 'scumm/cursor.cpp')
-rw-r--r--scumm/cursor.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp
index 4a96da63b7..bfb5ddc6c2 100644
--- a/scumm/cursor.cpp
+++ b/scumm/cursor.cpp
@@ -144,11 +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);
+ _macResExtractor->setCursor(img);
+ else
+ _win32ResExtractor->setCursor(img);
}
void ScummEngine_v6::setCursorFromImg(uint img, uint room, uint imgindex) {