[Scummvm-cvs-logs] SF.net SVN: scummvm:[55748] scummvm/trunk/engines/sci
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Thu Feb 3 03:26:57 CET 2011
Revision: 55748
http://scummvm.svn.sourceforge.net/scummvm/?rev=55748&view=rev
Author: mthreepwood
Date: 2011-02-03 02:26:57 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
SCI: Disable the special QFG1 Mac icon bar
The original interpreter completely ignores it in favor of the regular one.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kmisc.cpp
scummvm/trunk/engines/sci/graphics/screen.cpp
scummvm/trunk/engines/sci/sci.cpp
Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp 2011-02-03 01:47:41 UTC (rev 55747)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp 2011-02-03 02:26:57 UTC (rev 55748)
@@ -340,6 +340,12 @@
// kIconBar is really a subop of kPlatform for SCI1.1 Mac
reg_t kIconBar(EngineState *s, int argc, reg_t *argv) {
+ // QFG1 Mac calls this function to load the Mac icon bar (of which
+ // the resources do exist), but the game completely ignores it and
+ // uses the standard icon bar for the game. We do the same.
+ if (!g_sci->hasMacIconBar())
+ return NULL_REG;
+
// TODO...
if (argv[0].toUint16() == 4 && argv[1].toUint16() == 0) {
Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp 2011-02-03 01:47:41 UTC (rev 55747)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp 2011-02-03 02:26:57 UTC (rev 55748)
@@ -133,8 +133,6 @@
// to accommodate for the icon bar. Of course, both KQ6 and QFG1 VGA differ in size.
if (g_sci->getGameId() == GID_KQ6)
initGraphics(_displayWidth, _displayHeight + 26, _displayWidth > 320);
- else if (g_sci->getGameId() == GID_QFG1VGA)
- initGraphics(_displayWidth, _displayHeight + 20, _displayWidth > 320);
else
error("Unknown SCI1.1 Mac game");
} else
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2011-02-03 01:47:41 UTC (rev 55747)
+++ scummvm/trunk/engines/sci/sci.cpp 2011-02-03 02:26:57 UTC (rev 55748)
@@ -751,7 +751,7 @@
}
bool SciEngine::hasMacIconBar() const {
- return _resMan->isSci11Mac() && getSciVersion() == SCI_VERSION_1_1 && getGameId() != GID_HOYLE4;
+ return _resMan->isSci11Mac() && getSciVersion() == SCI_VERSION_1_1 && getGameId() == GID_KQ6;
}
Common::String SciEngine::getSavegameName(int nr) const {
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