[Scummvm-cvs-logs] SF.net SVN: scummvm: [26819] scummvm/trunk/engines/touche

[cyx at users.sourceforge.net]

Revision: 26819
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26819&view=rev
Author:   cyx
Date:     2007-05-12 19:08:53 -0700 (Sat, 12 May 2007)

Log Message:
-----------
french and german versions of Touche use the same charset data (confirmed by looking in both original executables)

Modified Paths:
--------------
    scummvm/trunk/engines/touche/graphics.cpp
    scummvm/trunk/engines/touche/graphics.h
    scummvm/trunk/engines/touche/staticres.cpp

Modified: scummvm/trunk/engines/touche/graphics.cpp
===================================================================
--- scummvm/trunk/engines/touche/graphics.cpp	2007-05-13 02:07:54 UTC (rev 26818)
+++ scummvm/trunk/engines/touche/graphics.cpp	2007-05-13 02:08:53 UTC (rev 26819)
@@ -31,12 +31,9 @@
 	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;

Modified: scummvm/trunk/engines/touche/graphics.h
===================================================================
--- scummvm/trunk/engines/touche/graphics.h	2007-05-13 02:07:54 UTC (rev 26818)
+++ scummvm/trunk/engines/touche/graphics.h	2007-05-13 02:08:53 UTC (rev 26819)
@@ -47,14 +47,17 @@
 
 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[];

Modified: scummvm/trunk/engines/touche/staticres.cpp
===================================================================
--- scummvm/trunk/engines/touche/staticres.cpp	2007-05-13 02:07:54 UTC (rev 26818)
+++ scummvm/trunk/engines/touche/staticres.cpp	2007-05-13 02:08:53 UTC (rev 26819)
@@ -450,7 +450,7 @@
 	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 @@
 	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,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.