diff options
| author | Gregory Montoir | 2007-05-03 22:56:02 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-05-03 22:56:02 +0000 |
| commit | 0e27c9c33919db1e2746e7eec40fd8f4c9ae7e04 (patch) | |
| tree | c0bff8e5979981f36f0153a88b57930960ee32b2 | |
| parent | 510f3c6e756b21abd98c4aeb26f0da72b9b4668e (diff) | |
| download | scummvm-rg350-0e27c9c33919db1e2746e7eec40fd8f4c9ae7e04.tar.gz scummvm-rg350-0e27c9c33919db1e2746e7eec40fd8f4c9ae7e04.tar.bz2 scummvm-rg350-0e27c9c33919db1e2746e7eec40fd8f4c9ae7e04.zip | |
added a TODO for the german charset data and renamed some static arrays/data
svn-id: r26742
| -rw-r--r-- | engines/touche/graphics.cpp | 9 | ||||
| -rw-r--r-- | engines/touche/graphics.h | 6 | ||||
| -rw-r--r-- | engines/touche/staticres.cpp | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/engines/touche/graphics.cpp b/engines/touche/graphics.cpp index 4d5867b81d..b995d6c702 100644 --- a/engines/touche/graphics.cpp +++ b/engines/touche/graphics.cpp @@ -31,9 +31,12 @@ void Graphics::setupFont(Common::Language language) { switch (language) { case Common::FR_FRA: case Common::DE_DEU: - _fontOffs = _locFontOffs; - _fontSize = _locFontSize; - _fontData = _locFontData; + // TODO: dump the charset data in the original german version executable. + // For now, just re-use the french charset data (it contains the "eszett" + // character) + _fontOffs = _freFontOffs; + _fontSize = _freFontSize; + _fontData = _freFontData; break; case Common::ES_ESP: _fontOffs = _spaFontOffs; diff --git a/engines/touche/graphics.h b/engines/touche/graphics.h index 636a1afa96..f23d949540 100644 --- a/engines/touche/graphics.h +++ b/engines/touche/graphics.h @@ -51,9 +51,9 @@ private: static const int _engFontSize; static const uint8 _engFontData[]; - static const uint16 _locFontOffs[]; - static const int _locFontSize; - static const uint8 _locFontData[]; + static const uint16 _freFontOffs[]; + static const int _freFontSize; + static const uint8 _freFontData[]; static const uint16 _spaFontOffs[]; static const int _spaFontSize; diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp index 15a170c8f7..3ca1f44b69 100644 --- a/engines/touche/staticres.cpp +++ b/engines/touche/staticres.cpp @@ -450,7 +450,7 @@ const uint8 Graphics::_engFontData[] = { 0x00, 0x35, 0xF0, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x00 }; -const uint16 Graphics::_locFontOffs[] = { +const uint16 Graphics::_freFontOffs[] = { 0x0000, 0x0007, 0x0024, 0x0043, 0x0072, 0x00AD, 0x00E0, 0x0113, 0x0124, 0x0141, 0x015E, 0x0191, 0x01C4, 0x01E3, 0x01F8, 0x0215, 0x0232, 0x0269, 0x0286, 0x02BD, 0x02F4, 0x032B, 0x0362, 0x0399, 0x03D0, 0x0407, 0x043E, 0x045B, 0x047C, 0x0495, @@ -473,9 +473,9 @@ const uint16 Graphics::_locFontOffs[] = { 0x0000, 0x0000, 0x0000, 0x1920 }; -const int Graphics::_locFontSize = ARRAYSIZE(Graphics::_locFontOffs); +const int Graphics::_freFontSize = ARRAYSIZE(Graphics::_freFontOffs); -const uint8 Graphics::_locFontData[] = { +const uint8 Graphics::_freFontData[] = { 0x01, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0D, 0x05, 0x3C, 0x03, 0xD7, 0x0D, 0xD7, 0xCD, 0xD7, 0xCD, 0xD7, 0xCD, 0xD7, 0xC3, 0xD7, 0xC0, 0xD7, 0xC0, 0x3F, 0xC0, 0xD7, 0x00, 0xD7, 0xC0, 0x3F, 0xC0, 0x0F, 0x00, 0x02, 0x07, 0x09, 0x3C, 0x3C, 0x00, 0x0C, 0xD7, 0xD7, 0x00, 0x37, 0xD7, |