[Scummvm-cvs-logs] SF.net SVN: scummvm:[41679] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41679
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41679&view=rev
Author:   lordhoto
Date:     2009-06-19 17:53:25 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Fix some warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-06-19 17:28:18 UTC (rev 41678)
+++ scummvm/trunk/engines/kyra/lol.h	2009-06-19 17:53:25 UTC (rev 41679)
@@ -852,7 +852,10 @@
 	void decodeSjis(const char *src, char *dst);
 
 	static const char * const _languageExt[];
-	static const char _fontConversionTableGerman[];
+
+	// TODO: Rethink of a proper way for conversion, currently our GUI charset isn't defined
+	// properly, thus this might not work on every system.
+	static const uint8 _fontConversionTableGerman[];
 	static const int _fontConversionTableGermanSize;
 
 	// graphics

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-06-19 17:28:18 UTC (rev 41678)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-06-19 17:53:25 UTC (rev 41679)
@@ -3296,7 +3296,7 @@
 	0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100
 };
 
-const char LoLEngine::_fontConversionTableGerman[] = {
+const uint8 LoLEngine::_fontConversionTableGerman[] = {
 	'\xC4', 0x8e, '\xE4', 0x84, '\xD6', 0x99, '\xF6',
 	0x94, '\xDC', 0x9a, '\xFC', 0x81, '\xDF', 0xe1
 };


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