From 85ce9340bcb425a6c5e8dbcacff5a7fa2fb4c817 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 29 Jul 2012 21:35:11 +0200
Subject: WINTERMUTE: Separate out SaveGame-code from BaseGame

---
 engines/wintermute/ad/ad_game.cpp | 28 ++--------------------------
 engines/wintermute/ad/ad_game.h   |  4 ----
 2 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'engines/wintermute/ad')

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)
-- 
cgit v1.2.3