WINTERMUTE: Separate out SaveGame-code from BaseGame

2 files changed, 2 insertions, 30 deletions

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index e399ba5fcf..3bda534a04 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -49,6 +49,7 @@
 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/base_viewport.h"

 #include "engines/wintermute/base/particles/part_emitter.h"

+#include "engines/wintermute/base/saveload.h"

 #include "engines/wintermute/base/scriptables/script_engine.h"

 #include "engines/wintermute/base/scriptables/script.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

@@ -1453,29 +1454,6 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-

-//////////////////////////////////////////////////////////////////////////

-bool AdGame::loadGame(const char *filename) {

-	bool ret = BaseGame::loadGame(filename);

-	if (DID_SUCCEED(ret)) {

-		SystemClassRegistry::getInstance()->enumInstances(afterLoadRegion, "AdRegion", NULL);

-	}

-	return ret;

-}

-

-//////////////////////////////////////////////////////////////////////////

-bool AdGame::initAfterLoad() {

-	BaseGame::initAfterLoad();

-	SystemClassRegistry::getInstance()->enumInstances(afterLoadScene,   "AdScene",   NULL);

-	return STATUS_OK;

-}

-

-//////////////////////////////////////////////////////////////////////////

-void AdGame::afterLoadScene(void *scene, void *data) {

-	((AdScene *)scene)->afterLoad();

-}

-

-

 //////////////////////////////////////////////////////////////////////////

 void AdGame::setPrevSceneName(const char *name) {

 	delete[] _prevSceneName;

@@ -1910,9 +1888,7 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) {
 		if (_stateEx == GAME_WAITING_RESPONSE) {

 			_responseBox->display();

 		}

-		if (_indicatorDisplay) {

-			displayIndicator();

-		}

+		_renderer->displayIndicator();

 

 

 		if (doUpdate || displayAll) {

diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index 7f76b959d4..080aea40aa 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -54,9 +54,6 @@ public:
 

 	virtual bool displayDebugInfo();

 

-	virtual bool initAfterLoad();

-	static void afterLoadScene(void *scene, void *data);

-

 	bool addSpeechDir(const char *dir);

 	bool removeSpeechDir(const char *dir);

 	char *findSpeechFile(char *StringID);

@@ -101,7 +98,6 @@ public:
 	void setPrevSceneName(const char *name);

 	void setPrevSceneFilename(const char *name);

 

-	virtual bool loadGame(const char *filename);

 	AdItem *_selectedItem;

 	bool cleanup();

 	DECLARE_PERSISTENT(AdGame, BaseGame)