aboutsummaryrefslogtreecommitdiff
path: root/engines/mads
diff options
context:
space:
mode:
authorPaul Gilbert2014-02-19 21:31:41 -0500
committerPaul Gilbert2014-02-19 21:31:41 -0500
commit1b0c1b3f561576cbcd7c1494d3893200442dace4 (patch)
tree5c8f8c60a3cb0e7478d2f19f57cbb2813e128169 /engines/mads
parentc687d3f64cc5ac6ec09539129c5f8b0d3a7148ad (diff)
downloadscummvm-rg350-1b0c1b3f561576cbcd7c1494d3893200442dace4.tar.gz
scummvm-rg350-1b0c1b3f561576cbcd7c1494d3893200442dace4.tar.bz2
scummvm-rg350-1b0c1b3f561576cbcd7c1494d3893200442dace4.zip
MADS: Fix GCC warnings
Diffstat (limited to 'engines/mads')
-rw-r--r--engines/mads/font.cpp4
-rw-r--r--engines/mads/palette.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/mads/font.cpp b/engines/mads/font.cpp
index 9da46c30b1..e97cc95fdf 100644
--- a/engines/mads/font.cpp
+++ b/engines/mads/font.cpp
@@ -112,14 +112,14 @@ int Font::write(MSurface *surface, const Common::String &msg, const Common::Poin
const char *text = msg.c_str();
while (*text) {
char theChar = (*text++) & 0x7F;
- int charWidth = _charWidths[theChar];
+ int charWidth = _charWidths[(byte)theChar];
if (charWidth > 0) {
if (xPos + charWidth >= width)
return xPos;
- uint8 *charData = &_charData[_charOffs[theChar]];
+ uint8 *charData = &_charData[_charOffs[(byte)theChar]];
int bpp = getBpp(charWidth);
if (skipY != 0)
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index a5d9c6ad1e..a97d5de20f 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -91,6 +91,11 @@ public:
* Creates a new palette instance
*/
static Palette *init(MADSEngine *vm);
+
+ /**
+ * Destructor
+ */
+ virtual ~Palette() {}
/**
* Sets a new palette