WII: Use OSystem's 'slots' for timer/savefile manager

3 files changed, 6 insertions, 27 deletions

diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index c16578d9b3..a981c61aea 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -34,6 +34,8 @@
 #include "common/config-manager.h"
 #include "common/textconsole.h"
 #include "backends/fs/wii/wii-fs-factory.h"
+#include "backends/saves/default/default-saves.h"
+#include "backends/timer/default/default-timer.h"
 
 #include "osystem.h"
 #include "options.h"
@@ -96,20 +98,12 @@ OSystem_Wii::OSystem_Wii() :
 	_padSensitivity(16),
 	_padAcceleration(4),
 
-	_savefile(NULL),
-	_mixer(NULL),
-	_timer(NULL) {
+	_mixer(NULL) {
 }
 
 OSystem_Wii::~OSystem_Wii() {
-	delete _savefile;
-	_savefile = NULL;
-
 	delete _mixer;
 	_mixer = NULL;
-
-	delete _timer;
-	_timer = NULL;
 }
 
 void OSystem_Wii::initBackend() {
@@ -143,8 +137,8 @@ void OSystem_Wii::initBackend() {
 	if (!getcwd(buf, MAXPATHLEN))
 		strcpy(buf, "/");
 
-	_savefile = new DefaultSaveFileManager(buf);
-	_timer = new DefaultTimerManager();
+	_savefileManager = new DefaultSaveFileManager(buf);
+	_timerManager = new DefaultTimerManager();
 
 	initGfx();
 	initSfx();
@@ -261,21 +255,11 @@ void OSystem_Wii::setWindowCaption(const char *caption) {
 	printf("window caption: %s\n", caption);
 }
 
-Common::SaveFileManager *OSystem_Wii::getSavefileManager() {
-	assert(_savefile);
-	return _savefile;
-}
-
 Audio::Mixer *OSystem_Wii::getMixer() {
 	assert(_mixer);
 	return _mixer;
 }
 
-Common::TimerManager *OSystem_Wii::getTimerManager() {
-	assert(_timer);
-	return _timer;
-}
-
 FilesystemFactory *OSystem_Wii::getFilesystemFactory() {
 	return &WiiFilesystemFactory::instance();
 }
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 981b25f69c..fe214a95cd 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -32,8 +32,6 @@
 #include "common/rect.h"
 #include "common/events.h"
 #include "backends/base-backend.h"
-#include "backends/saves/default/default-saves.h"
-#include "backends/timer/default/default-timer.h"
 #include "graphics/colormasks.h"
 #include "graphics/palette.h"
 #include "graphics/surface.h"
@@ -130,9 +128,7 @@ private:
 	void showOptionsDialog();
 
 protected:
-	Common::SaveFileManager *_savefile;
 	Audio::MixerImpl *_mixer;
-	DefaultTimerManager *_timer;
 
 public:
 	enum {
@@ -211,9 +207,7 @@ public:
 
 	virtual void setWindowCaption(const char *caption);
 
-	virtual Common::SaveFileManager *getSavefileManager();
 	virtual Audio::Mixer *getMixer();
-	virtual Common::TimerManager *getTimerManager();
 	virtual FilesystemFactory *getFilesystemFactory();
 	virtual void getTimeAndDate(TimeDate &t) const;
 
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 8e51bbc673..389d3823e7 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -35,6 +35,7 @@
 #endif
 
 #include "common/config-manager.h"
+#include "backends/timer/default/default-timer.h"
 
 #define TIMER_THREAD_STACKSIZE (1024 * 32)
 #define TIMER_THREAD_PRIO 64