aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2014-11-04 19:46:44 +0100
committerMartin Kiewitz2014-11-04 19:46:44 +0100
commitad8dbd364203a463fbae935b751cf96f76c38cf5 (patch)
tree14e5a7a6d39e391ac3605e012cd0a752b8fe0b38 /engines/sci
parentee876b56b291676faa4526b6df1e385d8560087f (diff)
downloadscummvm-rg350-ad8dbd364203a463fbae935b751cf96f76c38cf5.tar.gz
scummvm-rg350-ad8dbd364203a463fbae935b751cf96f76c38cf5.tar.bz2
scummvm-rg350-ad8dbd364203a463fbae935b751cf96f76c38cf5.zip
SCI: kStrCat does language-splitting for QfG1 too
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/kstring.cpp10
1 files changed, 6 insertions, 4 deletions
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);
}