diff options
| author | Gregory Montoir | 2007-05-13 02:08:53 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-05-13 02:08:53 +0000 |
| commit | 0a37086d316a76d51831447ee64d2129ac7d39ee (patch) | |
| tree | 2b21f39911f64961f9ca87ace34f6823be0fb2dd | |
| parent | 67c9099c34fd501c490de64b009b7de6dbe17e4c (diff) | |
| download | scummvm-rg350-0a37086d316a76d51831447ee64d2129ac7d39ee.tar.gz scummvm-rg350-0a37086d316a76d51831447ee64d2129ac7d39ee.tar.bz2 scummvm-rg350-0a37086d316a76d51831447ee64d2129ac7d39ee.zip | |
french and german versions of Touche use the same charset data (confirmed by looking in both original executables)
svn-id: r26819
| -rw-r--r-- | engines/touche/graphics.cpp | 9 | ||||
| -rw-r--r-- | engines/touche/graphics.h | 9 | ||||
| -rw-r--r-- | engines/touche/staticres.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/touche/graphics.cpp b/engines/touche/graphics.cpp index b995d6c702..32daa98cbe 100644 --- a/engines/touche/graphics.cpp +++ b/engines/touche/graphics.cpp @@ -31,12 +31,9 @@ void Graphics::setupFont(Common::Language language) { switch (language) { case Common::FR_FRA: case Common::DE_DEU: - // 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; + _fontOffs = _freGerFontOffs; + _fontSize = _freGerFontSize; + _fontData = _freGerFontData; break; case Common::ES_ESP: _fontOffs = _spaFontOffs; diff --git a/engines/touche/graphics.h b/engines/touche/graphics.h index f23d949540..71b77dc22c 100644 --- a/engines/touche/graphics.h +++ b/engines/touche/graphics.h @@ -47,14 +47,17 @@ public: private: + /* font data for english version */ static const uint16 _engFontOffs[]; static const int _engFontSize; static const uint8 _engFontData[]; - static const uint16 _freFontOffs[]; - static const int _freFontSize; - static const uint8 _freFontData[]; + /* font data for french and german versions */ + static const uint16 _freGerFontOffs[]; + static const int _freGerFontSize; + static const uint8 _freGerFontData[]; + /* font data for spanish version */ static const uint16 _spaFontOffs[]; static const int _spaFontSize; static const uint8 _spaFontData[]; diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp index 3ca1f44b69..8a68bbe049 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::_freFontOffs[] = { +const uint16 Graphics::_freGerFontOffs[] = { 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::_freFontOffs[] = { 0x0000, 0x0000, 0x0000, 0x1920 }; -const int Graphics::_freFontSize = ARRAYSIZE(Graphics::_freFontOffs); +const int Graphics::_freGerFontSize = ARRAYSIZE(Graphics::_freGerFontOffs); -const uint8 Graphics::_freFontData[] = { +const uint8 Graphics::_freGerFontData[] = { 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, |