[Scummvm-cvs-logs] scummvm master -> ad8dbd364203a463fbae935b751cf96f76c38cf5

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ad8dbd3642 SCI: kStrCat does language-splitting for QfG1 too


Commit: ad8dbd364203a463fbae935b751cf96f76c38cf5
    https://github.com/scummvm/scummvm/commit/ad8dbd364203a463fbae935b751cf96f76c38cf5
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-11-04T19:46:44+01:00

Commit Message:
SCI: kStrCat does language-splitting for QfG1 too

Changed paths:
    engines/sci/engine/kstring.cpp



diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 56dad58..eef758a 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);
 	}