diff options
| author | Matthew Hoops | 2009-08-27 01:39:30 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2009-08-27 01:39:30 +0000 |
| commit | 5d83522e75158c9e43cb2badd6b999b12d282957 (patch) | |
| tree | e0539180988ebfce2d60e3c1bf0bcfdd91dce641 /engines | |
| parent | 2ceafbae774f02f9b46835e2ba6f848984da4eb1 (diff) | |
| download | scummvm-rg350-5d83522e75158c9e43cb2badd6b999b12d282957.tar.gz scummvm-rg350-5d83522e75158c9e43cb2badd6b999b12d282957.tar.bz2 scummvm-rg350-5d83522e75158c9e43cb2badd6b999b12d282957.zip | |
Add the minor differences of SCI3 to the SCI2.1 kernel table.
svn-id: r43763
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/engine/kernel32.cpp | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index c0d8045899..5a1ff878d7 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -826,10 +826,10 @@ bool Kernel::loadKernelNames() { _kernelNames.clear(); #ifdef ENABLE_SCI32 - if (_resourceManager->sciVersion() == SCI_VERSION_2) - setKernelNamesSci2(); - else if (_resourceManager->sciVersion() == SCI_VERSION_2_1) + if (_resourceManager->sciVersion() >= SCI_VERSION_2_1) setKernelNamesSci21(); + else if (_resourceManager->sciVersion() == SCI_VERSION_2) + setKernelNamesSci2(); else #endif setDefaultKernelNames(); diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp index d6521af4e5..4c8b486653 100644 --- a/engines/sci/engine/kernel32.cpp +++ b/engines/sci/engine/kernel32.cpp @@ -258,7 +258,7 @@ static const char *sci21_default_knames[] = { /*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 @@ static const char *sci21_default_knames[] = { /*0x96*/ "Dummy", /*0x97*/ "Dummy", /*0x98*/ "Dummy", - /*0x99*/ "Dummy" + /*0x99*/ "Dummy", + + // SCI3 + /*0x9a*/ "Dummy", + /*0x9b*/ "Dummy", + /*0x9c*/ "DeletePic" }; void Kernel::setKernelNamesSci2() { |