aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-09-04 14:46:29 +0000
committerFilippos Karapetis2010-09-04 14:46:29 +0000
commit8a93da0516c5d35bc2581fe50602dd53fc101d70 (patch)
tree7c138a1a3ec11d9be3c756a34dfd1ddebcfc627c
parentb876527014ffbd1dd47eb735a77cca9a241175b9 (diff)
downloadscummvm-rg350-8a93da0516c5d35bc2581fe50602dd53fc101d70.tar.gz
scummvm-rg350-8a93da0516c5d35bc2581fe50602dd53fc101d70.tar.bz2
scummvm-rg350-8a93da0516c5d35bc2581fe50602dd53fc101d70.zip
SCI: Updated comment concerning kCantBeHere and removed a wrong check for Hoyle 3
svn-id: r52523
-rw-r--r--engines/sci/engine/kernel.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 157884fac3..ff327a0049 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -744,11 +744,9 @@ void Kernel::setDefaultKernelNames(GameFeatures *features) {
_kernelNames = Common::StringArray(s_defaultKernelNames, ARRAYSIZE(s_defaultKernelNames));
// Some (later) SCI versions replaced CanBeHere by CantBeHere
- if (_selectorCache.cantBeHere != -1) {
- // hoyle 3 has cantBeHere selector but is assuming to call kCanBeHere
- if (g_sci->getGameId() != GID_HOYLE3)
- _kernelNames[0x4d] = "CantBeHere";
- }
+ // If vocab.999 exists, the kernel function is still named CanBeHere
+ if (_selectorCache.cantBeHere != -1)
+ _kernelNames[0x4d] = "CantBeHere";
switch (getSciVersion()) {
case SCI_VERSION_0_EARLY: