[Scummvm-cvs-logs] SF.net SVN: scummvm:[43763] scummvm/trunk/engines/sci/engine
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Thu Aug 27 03:39:31 CEST 2009
Revision: 43763
http://scummvm.svn.sourceforge.net/scummvm/?rev=43763&view=rev
Author: mthreepwood
Date: 2009-08-27 01:39:30 +0000 (Thu, 27 Aug 2009)
Log Message:
-----------
Add the minor differences of SCI3 to the SCI2.1 kernel table.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kernel32.cpp
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-26 22:11:31 UTC (rev 43762)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-27 01:39:30 UTC (rev 43763)
@@ -826,10 +826,10 @@
_kernelNames.clear();
#ifdef ENABLE_SCI32
- if (_resourceManager->sciVersion() == SCI_VERSION_2)
+ if (_resourceManager->sciVersion() >= SCI_VERSION_2_1)
+ setKernelNamesSci21();
+ else if (_resourceManager->sciVersion() == SCI_VERSION_2)
setKernelNamesSci2();
- else if (_resourceManager->sciVersion() == SCI_VERSION_2_1)
- setKernelNamesSci21();
else
#endif
setDefaultKernelNames();
Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp 2009-08-26 22:11:31 UTC (rev 43762)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp 2009-08-27 01:39:30 UTC (rev 43763)
@@ -258,7 +258,7 @@
/*0x53*/ "MapKeyToDir",
/*0x54*/ "HaveMouse",
/*0x55*/ "SetCursor",
- /*0x56*/ "VibrateMouse",
+ /*0x56*/ "VibrateMouse", // NOTE: Not in SCI3, instead replaced by Dummy.
/*0x57*/ "Dummy",
/*0x58*/ "Dummy",
/*0x59*/ "Dummy",
@@ -325,7 +325,12 @@
/*0x96*/ "Dummy",
/*0x97*/ "Dummy",
/*0x98*/ "Dummy",
- /*0x99*/ "Dummy"
+ /*0x99*/ "Dummy",
+
+ // SCI3
+ /*0x9a*/ "Dummy",
+ /*0x9b*/ "Dummy",
+ /*0x9c*/ "DeletePic"
};
void Kernel::setKernelNamesSci2() {
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