diff options
| author | Filippos Karapetis | 2012-06-20 10:55:24 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-06-20 10:55:24 +0300 |
| commit | ea4260529783f80db0abde70c6b1723cf3c6f720 (patch) | |
| tree | 98b700414da3e8d380b6b54e897c42b9ed2e5572 /engines/sci/graphics/text32.cpp | |
| parent | 221ee34926927693182f835a4404eca17bdb1943 (diff) | |
| download | scummvm-rg350-ea4260529783f80db0abde70c6b1723cf3c6f720.tar.gz scummvm-rg350-ea4260529783f80db0abde70c6b1723cf3c6f720.tar.bz2 scummvm-rg350-ea4260529783f80db0abde70c6b1723cf3c6f720.zip | |
SCI: Remove multibyte character processing code from SCI32
There are no Japanese/PC-98 SCI32 games, so this code is not needed
Diffstat (limited to 'engines/sci/graphics/text32.cpp')
| -rw-r--r-- | engines/sci/graphics/text32.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp index e0f16e7265..f14ae2ef0b 100644 --- a/engines/sci/graphics/text32.cpp +++ b/engines/sci/graphics/text32.cpp @@ -165,7 +165,7 @@ reg_t GfxText32::createTextBitmapInternal(Common::String &text, reg_t textObject warning("Invalid alignment %d used in TextBox()", alignment); } - unsigned char curChar; + byte curChar; for (int i = 0; i < charCount; i++) { curChar = txt[i]; @@ -174,7 +174,6 @@ reg_t GfxText32::createTextBitmapInternal(Common::String &text, reg_t textObject case 0x0A: case 0x0D: case 0: - case 0x9781: // this one is used by SQ4/japanese as line break as well break; case 0x7C: warning("Code processing isn't implemented in SCI32"); @@ -317,7 +316,7 @@ void GfxText32::StringWidth(const char *str, GuiResourceId fontId, int16 &textWi } void GfxText32::Width(const char *text, int16 from, int16 len, GuiResourceId fontId, int16 &textWidth, int16 &textHeight, bool restoreFont) { - uint16 curChar; + byte curChar; textWidth = 0; textHeight = 0; GfxFont *font = _cache->getFont(fontId); @@ -329,7 +328,6 @@ void GfxText32::Width(const char *text, int16 from, int16 len, GuiResourceId fon switch (curChar) { case 0x0A: case 0x0D: - case 0x9781: // this one is used by SQ4/japanese as line break as well textHeight = MAX<int16> (textHeight, font->getHeight()); break; case 0x7C: |