aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-03-10 06:47:26 +0100
committerStrangerke2014-03-10 06:51:27 +0100
commitaca7fac256f5e0b404a14bb544c1e734473fd7ac (patch)
treeb0c9c04438bd24cd0c1f26375f3dd3f547edfc03
parentf9fd2a5abe2050b061710f0c8e3ac68f79b74459 (diff)
downloadscummvm-rg350-aca7fac256f5e0b404a14bb544c1e734473fd7ac.tar.gz
scummvm-rg350-aca7fac256f5e0b404a14bb544c1e734473fd7ac.tar.bz2
scummvm-rg350-aca7fac256f5e0b404a14bb544c1e734473fd7ac.zip
TONY: Fix clang warnings - Courtesy of LordHoto
-rw-r--r--engines/tony/font.h1
-rw-r--r--engines/tony/game.h1
-rw-r--r--engines/tony/gfxcore.h2
-rw-r--r--engines/tony/inventory.h2
4 files changed, 5 insertions, 1 deletions
diff --git a/engines/tony/font.h b/engines/tony/font.h
index 6e76c42750..d52547a58d 100644
--- a/engines/tony/font.h
+++ b/engines/tony/font.h
@@ -347,6 +347,7 @@ public:
virtual ~RMDialogChoice();
// Initialization and closure
+ using RMGfxWoodyBuffer::init;
void init();
void close();
diff --git a/engines/tony/game.h b/engines/tony/game.h
index d03a975b6f..cda07de889 100644
--- a/engines/tony/game.h
+++ b/engines/tony/game.h
@@ -300,6 +300,7 @@ public:
RMOptionScreen();
virtual ~RMOptionScreen();
+ using RMGfxWoodyBuffer::init;
void init(CORO_PARAM, RMGfxTargetBuffer &bigBuf, bool &result);
void initLoadMenuOnly(CORO_PARAM, RMGfxTargetBuffer &bigBuf, bool bAlternateGfx, bool &result);
void initSaveMenuOnly(CORO_PARAM, RMGfxTargetBuffer &bigBuf, bool bAlternateGfx, bool &result);
diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
index 06073609ea..a637027051 100644
--- a/engines/tony/gfxcore.h
+++ b/engines/tony/gfxcore.h
@@ -71,7 +71,7 @@ public:
int getDimy();
// Creation
- virtual void create(int dimx, int dimy, int nBpp);
+ void create(int dimx, int dimy, int nBpp);
virtual void destroy();
// These are valid only if the buffer is locked
diff --git a/engines/tony/inventory.h b/engines/tony/inventory.h
index ee7bf115c7..135480a3e9 100644
--- a/engines/tony/inventory.h
+++ b/engines/tony/inventory.h
@@ -101,6 +101,7 @@ public:
/**
* Initialization and closing
*/
+ using RMGfxWoodyBuffer::init;
virtual void init();
void close();
void reset();
@@ -209,6 +210,7 @@ public:
/**
* Initialization
*/
+ using RMGfxSourceBuffer8RLEByte::init;
void init();
void close();