aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-19 17:53:25 +0000
committerJohannes Schickel2009-06-19 17:53:25 +0000
commitd4e01e3a1b56cfc640b1c97753f47106f4f39123 (patch)
tree8bc5948fa279fc2cffbf5f87cb518c1c8cedf069
parentec7d86404c672f62368bdddaba1f4258960141de (diff)
downloadscummvm-rg350-d4e01e3a1b56cfc640b1c97753f47106f4f39123.tar.gz
scummvm-rg350-d4e01e3a1b56cfc640b1c97753f47106f4f39123.tar.bz2
scummvm-rg350-d4e01e3a1b56cfc640b1c97753f47106f4f39123.zip
Fix some warnings.
svn-id: r41679
-rw-r--r--engines/kyra/lol.h5
-rw-r--r--engines/kyra/staticres.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index b393ce2680..c4b7ea7819 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -852,7 +852,10 @@ private:
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
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 7b518f727f..b7d3a3a821 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -3296,7 +3296,7 @@ const int LoLEngine::_outroMonsterScaleTableY[] = {
0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100
};
-const char LoLEngine::_fontConversionTableGerman[] = {
+const uint8 LoLEngine::_fontConversionTableGerman[] = {
'Ä', 0x8e, 'ä', 0x84, 'Ö', 0x99, 'ö',
0x94, 'Ü', 0x9a, 'ü', 0x81, 'ß', 0xe1
};