aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2011-08-26 01:25:41 +0300
committerFilippos Karapetis2011-08-26 01:25:41 +0300
commitd570b415610b62e97537c76df5778d6825a7c3e4 (patch)
treec3052516ba97405c7a772ad7cb931584fa97456a /engines
parent355d1b9745386e7c4f366541ea0084915bdb1a83 (diff)
downloadscummvm-rg350-d570b415610b62e97537c76df5778d6825a7c3e4.tar.gz
scummvm-rg350-d570b415610b62e97537c76df5778d6825a7c3e4.tar.bz2
scummvm-rg350-d570b415610b62e97537c76df5778d6825a7c3e4.zip
SCI: Fixed bug #3396887 - "SCI: pq2-pc98-jp - Listing of items / Inventory not working"
Thanks to wjp for his valuable help on this
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/kstring.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index b383f88840..783845bb76 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -42,6 +42,14 @@ 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) {
+ s1 = g_sci->strSplit(s1.c_str(), NULL);
+ s2 = g_sci->strSplit(s2.c_str(), NULL);
+ }
+
s1 += s2;
s->_segMan->strcpy(argv[0], s1.c_str());
return argv[0];