libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-07 19:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Don't fallback to views in SCI1.1+ Mac games

Browse Source 
svn-id: r55871
This commit is contained in:
Matthew Hoops 2011-02-10 15:56:35 +00:00
parent 67d38dc5c3
commit 80347e9630
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/sci/graphics/cursor.cpp
View File

@ -429,24 +429,14 @@ void GfxCursor::kernelSetMacCursor(GuiResourceId viewNum, int loopNum, int celNu
// Here we try to map the view number onto the cursor. What they did was keep the
// kSetCursor calls the same, but perform remapping on the cursors. They also took
// it a step further and added a new kPlatform sub-subop that handles remapping
// automatically.
// automatically. The view resources may exist, but none of the games actually
// use them.
if (_macCursorRemap.empty()) {
// QFG1/Freddy use a straight viewNum->cursor ID mapping
if (g_sci->getGameId() != GID_QFG1VGA && g_sci->getGameId() != GID_FREDDYPHARKAS) {
// The scripts have given us no remapping, so let's try to do this manually.
// First try and see if the view resource exists. If it does, we're just using
// that cursor (Hoyle4 does not use Mac cursors, although it has them).
if (_resMan->testResource(ResourceId(kResourceTypeView, viewNum))) {
CursorMan.disableCursorPalette(true);
kernelSetView(viewNum, loopNum, celNum, hotspot);
return;
} else if (g_sci->getGameId() == GID_KQ6) {
// KQ6 seems to use this mapping for its cursors
viewNum = loopNum * 1000 + celNum;
} else
error("Unknown Mac cursor %d", viewNum);
}
// QFG1/Freddy/Hoyle4 use a straight viewNum->cursor ID mapping
// KQ6 seems to use this mapping for its cursors
if (g_sci->getGameId() == GID_KQ6)
viewNum = loopNum * 1000 + celNum;
} else {
// If we do have the list, we'll be using a remap based on what the
// scripts have given us.
@ -464,7 +454,8 @@ void GfxCursor::kernelSetMacCursor(GuiResourceId viewNum, int loopNum, int celNu
Resource *resource = _resMan->findResource(ResourceId(kResourceTypeCursor, viewNum), false);
if (!resource) {
warning("Mac cursor %d not found", viewNum);
// The cursor resources often don't exist, this is normal behavior
debug(0, "Mac cursor %d not found", viewNum);
return;
}