WINTERMUTE: Detach BaseSaveThumbHelper from inheritance tree.

5 files changed, 18 insertions, 19 deletions

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 3d821ca5d2..4e74dffc12 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -1836,7 +1836,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	else if (strcmp(name, "StoreSaveThumbnail") == 0) {
 		stack->correctParams(0);
 		delete _cachedThumbnail;
-		_cachedThumbnail = new BaseSaveThumbHelper(this);
+		_cachedThumbnail = new SaveThumbHelper(this);
 		if (DID_FAIL(_cachedThumbnail->storeThumbnail())) {
 			delete _cachedThumbnail;
 			_cachedThumbnail = nullptr;
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 43deccf18d..cd7f752f4a 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -44,21 +44,21 @@ class BaseFader;
 class BaseFont;
 class BaseFileManager;
 class BaseTransitionMgr;
-class ScEngine;
 class BaseFontStorage;
 class BaseGameMusic;
 class BaseQuickMsg;
-class UIWindow;
 class BaseViewport;
 class BaseRenderer;
 class BaseRegistry;
-class BaseSaveThumbHelper;
 class BaseSurfaceStorage;
-class SXMath;
 class BaseKeyboardState;
+class BaseGameSettings;
+class ScEngine;
+class SXMath;
+class UIWindow;
 class VideoPlayer;
 class VideoTheoraPlayer;
-class BaseGameSettings;
+class SaveThumbHelper;
 
 class BaseGame: public BaseObject {
 public:
@@ -247,7 +247,7 @@ public:
 	BaseSprite *_lastCursor;
 	bool drawCursor(BaseSprite *Cursor);
 
-	BaseSaveThumbHelper *_cachedThumbnail;
+	SaveThumbHelper *_cachedThumbnail;
 	void addMem(int bytes);
 	bool _touchInterface;
 	bool _constrainedMemory;
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 318c2c8f1b..7c866349b5 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -228,7 +228,7 @@ bool BasePersistenceManager::initSave(const char *desc) {
 	if (_saveStream) {
 		// get thumbnails
 		if (!_gameRef->_cachedThumbnail) {
-			_gameRef->_cachedThumbnail = new BaseSaveThumbHelper(_gameRef);
+			_gameRef->_cachedThumbnail = new SaveThumbHelper(_gameRef);
 			if (DID_FAIL(_gameRef->_cachedThumbnail->storeThumbnail(true))) {
 				delete _gameRef->_cachedThumbnail;
 				_gameRef->_cachedThumbnail = nullptr;
diff --git a/engines/wintermute/base/base_save_thumb_helper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp
index 9b68ed647c..7590cd0710 100644
--- a/engines/wintermute/base/base_save_thumb_helper.cpp
+++ b/engines/wintermute/base/base_save_thumb_helper.cpp
@@ -35,20 +35,20 @@
 namespace Wintermute {
 
 //////////////////////////////////////////////////////////////////////////
-BaseSaveThumbHelper::BaseSaveThumbHelper(BaseGame *inGame) : BaseClass(inGame) {
+SaveThumbHelper::SaveThumbHelper(BaseGame *inGame) {
 	_thumbnail = nullptr;
 	_scummVMThumb = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
-BaseSaveThumbHelper::~BaseSaveThumbHelper(void) {
+SaveThumbHelper::~SaveThumbHelper(void) {
 	delete _thumbnail;
 	_thumbnail = nullptr;
 	delete _scummVMThumb;
 	_scummVMThumb = nullptr;
 }
 
-BaseImage *BaseSaveThumbHelper::storeThumb(bool doFlip, int width, int height) {
+BaseImage *SaveThumbHelper::storeThumb(bool doFlip, int width, int height) {
 	BaseImage *thumbnail = nullptr;
 	if (_gameRef->getSaveThumbWidth() > 0 && _gameRef->getSaveThumbHeight() > 0) {
 		if (doFlip) {
@@ -80,7 +80,7 @@ BaseImage *BaseSaveThumbHelper::storeThumb(bool doFlip, int width, int height) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSaveThumbHelper::storeThumbnail(bool doFlip) {
+bool SaveThumbHelper::storeThumbnail(bool doFlip) {
 	delete _thumbnail;
 	_thumbnail = nullptr;
 
@@ -96,7 +96,7 @@ bool BaseSaveThumbHelper::storeThumbnail(bool doFlip) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseSaveThumbHelper::storeScummVMThumbNail(bool doFlip) {
+bool SaveThumbHelper::storeScummVMThumbNail(bool doFlip) {
 	delete _scummVMThumb;
 	_scummVMThumb = nullptr;
 	
diff --git a/engines/wintermute/base/base_save_thumb_helper.h b/engines/wintermute/base/base_save_thumb_helper.h
index 8e8a7183c2..cbf0345709 100644
--- a/engines/wintermute/base/base_save_thumb_helper.h
+++ b/engines/wintermute/base/base_save_thumb_helper.h
@@ -28,17 +28,15 @@
 #ifndef WINTERMUTE_BASE_SAVE_THUMB_HELPER_H
 #define WINTERMUTE_BASE_SAVE_THUMB_HELPER_H
 
-
-#include "engines/wintermute/base/base.h"
-
 namespace Wintermute {
 
 class BaseImage;
+class BaseGame;
 
-class BaseSaveThumbHelper : public BaseClass {
+class SaveThumbHelper {
 public:
-	BaseSaveThumbHelper(BaseGame *inGame);
-	virtual ~BaseSaveThumbHelper(void);
+	SaveThumbHelper(BaseGame *inGame);
+	virtual ~SaveThumbHelper(void);
 	bool storeThumbnail(bool doFlip = false);
 	bool storeScummVMThumbNail(bool doFlip = false);
 
@@ -47,6 +45,7 @@ public:
 private:
 	BaseImage *storeThumb(bool doFlip, int width, int height);
 	BaseImage *_richThumbnail;
+	BaseGame *_gameRef;
 };
 
 } // end of namespace Wintermute