aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMatthew Hoops2009-06-25 00:14:07 +0000
committerMatthew Hoops2009-06-25 00:14:07 +0000
commit4df9dd82fb2a4e9f5772368ec869788e64e380ff (patch)
tree64e54ff4445407706a9daa40e7cf72ba1bdd8ad8 /engines/sci/engine
parentd03dc08b64073044267fb4b3ca6704fd62a19741 (diff)
downloadscummvm-rg350-4df9dd82fb2a4e9f5772368ec869788e64e380ff.tar.gz
scummvm-rg350-4df9dd82fb2a4e9f5772368ec869788e64e380ff.tar.bz2
scummvm-rg350-4df9dd82fb2a4e9f5772368ec869788e64e380ff.zip
After discussing with waltervn, committing my fix for the King's Quest I Demo (original from Patch #2795916). I'm also fixing the full game as well :)
svn-id: r41841
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kernel.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index baf45d80c7..eafc6dbd4d 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -945,7 +945,11 @@ bool Kernel::loadKernelNames() {
switch (_resmgr->_sciVersion) {
case SCI_VERSION_0:
case SCI_VERSION_01:
- vocab_get_knames0(_resmgr, _kernelNames);
+ // HACK: The KQ1 demo requires the SCI1 vocabulary.
+ if (((SciEngine*)g_engine)->getFlags() & GF_SCI0_SCI1VOCAB)
+ vocab_get_knames1(_resmgr, _kernelNames);
+ else
+ vocab_get_knames0(_resmgr, _kernelNames);
break;
case SCI_VERSION_01_VGA:
case SCI_VERSION_01_VGA_ODD: