diff options
| author | Martin Kiewitz | 2015-06-14 21:14:17 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-06-14 21:14:17 +0200 |
| commit | f713094c6427e22c442b9b98be0f79d383d32b23 (patch) | |
| tree | 09aa80edfc88a92221735f9bba471c208f430776 /engines/sherlock/scalpel/scalpel_talk.cpp | |
| parent | 133b4defe9f37ac1b2198b843282ab0b0a0e7b6b (diff) | |
| download | scummvm-rg350-f713094c6427e22c442b9b98be0f79d383d32b23.tar.gz scummvm-rg350-f713094c6427e22c442b9b98be0f79d383d32b23.tar.bz2 scummvm-rg350-f713094c6427e22c442b9b98be0f79d383d32b23.zip | |
SHERLOCK: SS: fix talkInterf to handle int. chars
so that line wrapping works properly for international versions
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_talk.cpp')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index c514ab1522..c86720f778 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -214,10 +214,10 @@ void ScalpelTalk::talkInterface(const byte *&str) { width += screen.charWidth(str[idx]); ++idx; ++_charCount; - } while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < _opcodes[0]); + } while (width < 298 && str[idx] && str[idx] != '{' && (!isOpcode(str[idx]))); if (str[idx] || width >= 298) { - if (str[idx] < _opcodes[0] && str[idx] != '{') { + if ((!isOpcode(str[idx])) && str[idx] != '{') { --idx; --_charCount; } @@ -261,7 +261,7 @@ void ScalpelTalk::talkInterface(const byte *&str) { str += idx; // If line wrap occurred, then move to after the separating space between the words - if (str[0] < _opcodes[0] && str[0] != '{') + if ((!isOpcode(str[0])) && str[0] != '{') ++str; _yp += 9; |