From c299dbeb26b38342e2a5c6b9e59b810e48572cd6 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Tue, 12 May 2009 12:31:09 +0000
Subject: SCI: Merged Message() and GetMessage(). Set SCI1.1 to use SCI1 kernel
 table (for now).

svn-id: r40481
---
 engines/sci/scicore/vocab_debug.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/sci/scicore/vocab_debug.cpp')

diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp
index 70c02672b3..058c81c337 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/scicore/vocab_debug.cpp
@@ -276,7 +276,7 @@ static const char *sci1_default_knames[SCI1_KNAMES_DEFAULT_ENTRIES_NR] = {
 	/*0x79*/ "ATan",
 	/*0x7a*/ "Lock",         
 	/*0x7b*/ "StrSplit",       
-	/*0x7c*/ "GetMessage",
+	/*0x7c*/ "Message",
 	/*0x7d*/ "IsItSkip"
 };
 
@@ -456,7 +456,7 @@ static void vocabulary_get_knames1(ResourceManager *resmgr, Common::StringList &
 		names[i] = sci1_default_knames[i];
 }
 
-//
+#ifdef ENABLE_SCI32
 static void vocabulary_get_knames11(ResourceManager *resmgr, Common::StringList &names) {
 /*
  999.voc format for SCI1.1 games:
@@ -481,6 +481,7 @@ static void vocabulary_get_knames11(ResourceManager *resmgr, Common::StringList
 		names[i] = Common::String((char *)r->data + off + 2, len);
 	}
 }
+#endif
 
 void vocabulary_get_knames(ResourceManager *resmgr, Common::StringList &names) {
 	names.clear();
@@ -502,7 +503,7 @@ void vocabulary_get_knames(ResourceManager *resmgr, Common::StringList &names) {
 		vocabulary_get_knames1(resmgr, names);
 		break;
 	case SCI_VERSION_1_1:
-		vocabulary_get_knames11(resmgr, names);
+		vocabulary_get_knames1(resmgr, names);
 		break;
 #ifdef ENABLE_SCI32
 	case SCI_VERSION_32:
-- 
cgit v1.2.3