From 72f65b3946278661db95fc02511444ff1658a3bf Mon Sep 17 00:00:00 2001
From: md5
Date: Sun, 27 Feb 2011 16:48:53 +0200
Subject: SCI: Renamed SCI_VERSION_1_EGA to SCI_VERSION_1_EGA_ONLY

This renaming allows us to better distinguish that this version is for games
that only had an EGA version, and avoid confusion with newer SCI1 game releases
with EGA graphics (e.g. KQ5 EGA). The only game with this SCI version is QFG2,
a SCI1 EGA game with a parser. Also, added some games for each SCI version.
---
 engines/sci/engine/kparse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/kparse.cpp')

diff --git a/engines/sci/engine/kparse.cpp b/engines/sci/engine/kparse.cpp
index e8f8ee7152..c0a5e95811 100644
--- a/engines/sci/engine/kparse.cpp
+++ b/engines/sci/engine/kparse.cpp
@@ -169,7 +169,7 @@ reg_t kSetSynonyms(EngineState *s, int argc, reg_t *argv) {
 	Vocabulary *voc = g_sci->getVocabulary();
 
 	// Only SCI0-SCI1 EGA games had a parser. In newer versions, this is a stub
-	if (getSciVersion() > SCI_VERSION_1_EGA)
+	if (getSciVersion() > SCI_VERSION_1_EGA_ONLY)
 		return s->r_acc;
 
 	voc->clearSynonyms();
-- 
cgit v1.2.3


From eece58df7f20b6411f5e534cbdf7b80c19fdee2a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 8 Mar 2011 22:50:10 +0100
Subject: SCI: Remove unused argument to said

---
 engines/sci/engine/kparse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/kparse.cpp')

diff --git a/engines/sci/engine/kparse.cpp b/engines/sci/engine/kparse.cpp
index c0a5e95811..09cf7744b2 100644
--- a/engines/sci/engine/kparse.cpp
+++ b/engines/sci/engine/kparse.cpp
@@ -70,7 +70,7 @@ reg_t kSaid(EngineState *s, int argc, reg_t *argv) {
 		return NULL_REG;
 	}
 
-	new_lastmatch = said(s, said_block, debug_parser);
+	new_lastmatch = said(said_block, debug_parser);
 	if (new_lastmatch  != SAID_NO_MATCH) { /* Build and possibly display a parse tree */
 
 #ifdef DEBUG_PARSER
-- 
cgit v1.2.3