aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/msurface.h
diff options
context:
space:
mode:
authorPaul Gilbert2014-02-18 23:56:41 -0500
committerPaul Gilbert2014-02-18 23:56:41 -0500
commit97087e8cd1aee602217c36f1c71d4ca3f74e0e40 (patch)
tree8a3fce5138eb39395ea502893d685caa51d64048 /engines/mads/msurface.h
parent530cbb4bc3406757ee3daeb3fc1972f79fd9199b (diff)
downloadscummvm-rg350-97087e8cd1aee602217c36f1c71d4ca3f74e0e40.tar.gz
scummvm-rg350-97087e8cd1aee602217c36f1c71d4ca3f74e0e40.tar.bz2
scummvm-rg350-97087e8cd1aee602217c36f1c71d4ca3f74e0e40.zip
MADS: Fix warnings identified by gcc
Diffstat (limited to 'engines/mads/msurface.h')
-rw-r--r--engines/mads/msurface.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index 9bb651b02b..21b0cbcd2f 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -69,6 +69,8 @@ protected:
MSurface(bool isScreen = false);
MSurface(int w, int h);
public:
+ virtual ~MSurface() {}
+
void create(int w, int h) {
Graphics::Surface::create(w, h, Graphics::PixelFormat::createFormatCLUT8());
}
@@ -155,7 +157,7 @@ class MSurfaceM4: public MSurface {
friend class MSurface;
protected:
MSurfaceM4(bool isScreen = false): MSurface(isScreen) {}
- MSurfaceM4(int w, int h): MSurface(w, h) {}
+ MSurfaceM4(int widthVal, int heightVal): MSurface(widthVal, heightVal) {}
void loadBackgroundStream(Common::SeekableReadStream *source);
public:
@@ -167,18 +169,10 @@ class MSurfaceRiddle: public MSurfaceM4 {
friend class MSurface;
protected:
MSurfaceRiddle(bool isScreen = false): MSurfaceM4(isScreen) {}
- MSurfaceRiddle(int w, int h): MSurfaceM4(w, h) {}
+ MSurfaceRiddle(int widthVal, int heightVal): MSurfaceM4(widthVal, heightVal) {}
public:
virtual void loadBackground(const Common::String &sceneName);
};
-/*
- void rexLoadBackground(Common::SeekableReadStream *source, RGBList **palData = NULL);
- void madsLoadBackground(int roomNumber, RGBList **palData = NULL);
- void m4LoadBackground(Common::SeekableReadStream *source);
-
- void madsloadInterface(int index, RGBList **palData);
-
- */
} // End of namespace MADS