[Scummvm-cvs-logs] scummvm master -> 68f0c4302179797201d54f31c01f2aae172c0aa0

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
aca7fac256 TONY: Fix clang warnings - Courtesy of LordHoto
68f0c43021 TONY: Revert 60980e783ef263f3ed5aa708dc3032779d3be923


Commit: aca7fac256f5e0b404a14bb544c1e734473fd7ac
    https://github.com/scummvm/scummvm/commit/aca7fac256f5e0b404a14bb544c1e734473fd7ac
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-10T06:51:27+01:00

Commit Message:
TONY: Fix clang warnings - Courtesy of LordHoto

Changed paths:
    engines/tony/font.h
    engines/tony/game.h
    engines/tony/gfxcore.h
    engines/tony/inventory.h



diff --git a/engines/tony/font.h b/engines/tony/font.h
index 6e76c42..d52547a 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 d03a975..cda07de 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 0607360..a637027 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 ee7bf11..135480a 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();
 


Commit: 68f0c4302179797201d54f31c01f2aae172c0aa0
    https://github.com/scummvm/scummvm/commit/68f0c4302179797201d54f31c01f2aae172c0aa0
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-10T06:51:28+01:00

Commit Message:
TONY: Revert 60980e783ef263f3ed5aa708dc3032779d3be923

Changed paths:
    engines/tony/gfxcore.h
    engines/tony/inventory.h



diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
index a637027..c908150 100644
--- a/engines/tony/gfxcore.h
+++ b/engines/tony/gfxcore.h
@@ -220,7 +220,7 @@ public:
 	virtual ~RMGfxSourceBuffer16();
 
 	// Initialization
-	virtual void create(int dimx, int dimy);
+	void create(int dimx, int dimy);
 
 	int getBpp();
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -263,7 +263,7 @@ public:
 	virtual ~RMGfxSourceBuffer8();
 
 	// Initialization
-	virtual void create(int dimx, int dimy);
+	void create(int dimx, int dimy);
 
 	int getBpp();
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -424,7 +424,7 @@ public:
 	RMGfxSourceBuffer4(int dimx, int dimy);
 
 	// Initialization
-	virtual void create(int dimx, int dimy);
+	void create(int dimx, int dimy);
 
 	int getBpp();
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
diff --git a/engines/tony/inventory.h b/engines/tony/inventory.h
index 135480a..5528e65 100644
--- a/engines/tony/inventory.h
+++ b/engines/tony/inventory.h
@@ -102,7 +102,7 @@ public:
 	 * Initialization and closing
 	 */
 	using RMGfxWoodyBuffer::init;
-	virtual void init();
+	void init();
 	void close();
 	void reset();