diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /engines/sci/engine/kstring.cpp | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sci/engine/kstring.cpp')
| -rw-r--r-- | engines/sci/engine/kstring.cpp | 8 |
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]; |