From ad8dbd364203a463fbae935b751cf96f76c38cf5 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 4 Nov 2014 19:46:44 +0100
Subject: SCI: kStrCat does language-splitting for QfG1 too

---
 engines/sci/engine/kstring.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 56dad583e4..eef758a0d9 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -42,10 +42,12 @@ reg_t kStrCat(EngineState *s, int argc, reg_t *argv) {
 	Common::String s1 = s->_segMan->getString(argv[0]);
 	Common::String s2 = s->_segMan->getString(argv[1]);
 
-	// The Japanese version of PQ2 splits the two strings here
-	// (check bug #3396887).
-	if (g_sci->getGameId() == GID_PQ2 &&
-		g_sci->getLanguage() == Common::JA_JPN) {
+	// Japanese PC-9801 interpreter splits strings here
+	//  see bug #5834
+	//  Verified for Police Quest 2 + Quest For Glory 1
+	//  However Space Quest 4 PC-9801 doesn't
+	if ((g_sci->getLanguage() == Common::JA_JPN)
+		&& (getSciVersion() <= SCI_VERSION_01)) {
 		s1 = g_sci->strSplit(s1.c_str(), NULL);
 		s2 = g_sci->strSplit(s2.c_str(), NULL);
 	}
-- 
cgit v1.2.3