diff options
| author | Torbjörn Andersson | 2008-06-09 17:50:52 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2008-06-09 17:50:52 +0000 |
| commit | 339874f6c0934e16ac78c9b79a94b765668409af (patch) | |
| tree | 55728234745851b1733ecc02d75f5bcd67008b70 /engines/m4 | |
| parent | 50c62c7eac52dbb8beb6e3381a1312be45c43835 (diff) | |
| download | scummvm-rg350-339874f6c0934e16ac78c9b79a94b765668409af.tar.gz scummvm-rg350-339874f6c0934e16ac78c9b79a94b765668409af.tar.bz2 scummvm-rg350-339874f6c0934e16ac78c9b79a94b765668409af.zip | |
Fixed warnings. (Mainly, GCC 4.3 doesn't want you to use "char" as an array
index. Probably because it's undefined whether or not it's signed.)
svn-id: r32637
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/converse.cpp | 2 | ||||
| -rw-r--r-- | engines/m4/converse.h | 2 | ||||
| -rw-r--r-- | engines/m4/font.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp index 6480428661..729af6c40f 100644 --- a/engines/m4/converse.cpp +++ b/engines/m4/converse.cpp @@ -1110,7 +1110,7 @@ void Converse::setValue(int32 offset, int32 value) { _variables[hashOffset] = value; } -const int32 Converse::getValue(int32 offset) { +int32 Converse::getValue(int32 offset) { char hashOffset[10]; sprintf(hashOffset, "%i", offset); ConvVarHashMap::const_iterator entry = _variables.find(hashOffset); diff --git a/engines/m4/converse.h b/engines/m4/converse.h index bea90d9ddf..4bd4524029 100644 --- a/engines/m4/converse.h +++ b/engines/m4/converse.h @@ -171,7 +171,7 @@ public: ConvEntry *getNode(int32 index) { return _convNodes[index]; } void setValue(int32 offset, int32 value); - const int32 getValue(int32 offset); + int32 getValue(int32 offset); bool evaluateCondition(int32 leftVal, int32 op, int32 rightVal); bool performAction(EntryAction *action); /* diff --git a/engines/m4/font.cpp b/engines/m4/font.cpp index c9b9a44f23..119e7297cf 100644 --- a/engines/m4/font.cpp +++ b/engines/m4/font.cpp @@ -192,7 +192,7 @@ int32 Font::write(M4Surface *surface, const char *text, int x, int y, int width, while (*text) { - char theChar = (*text++) & 0x7F; + unsigned char theChar = (*text++) & 0x7F; int charWidth = _charWidths[theChar]; if (charWidth > 0) { |