[Scummvm-cvs-logs] SF.net SVN: scummvm:[55871] scummvm/trunk/engines/sci/graphics/cursor.cpp
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Thu Feb 10 16:56:35 CET 2011
Revision: 55871
http://scummvm.svn.sourceforge.net/scummvm/?rev=55871&view=rev
Author: mthreepwood
Date: 2011-02-10 15:56:35 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
SCI: Don't fallback to views in SCI1.1+ Mac games
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/cursor.cpp
Modified: scummvm/trunk/engines/sci/graphics/cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.cpp 2011-02-10 15:53:28 UTC (rev 55870)
+++ scummvm/trunk/engines/sci/graphics/cursor.cpp 2011-02-10 15:56:35 UTC (rev 55871)
@@ -429,24 +429,14 @@
// 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 @@
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;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list