From 307d7aeb4fc044d925295b6ed1d4c7c359a99920 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Thu, 24 Jun 2010 17:37:09 +0000
Subject: Added a init function to OSystem_SDL for early backend setup, and so
 allowing better sub classing.

svn-id: r50224
---
 backends/platform/sdl/posix/main.cpp  | 6 ++++++
 backends/platform/sdl/posix/posix.cpp | 6 ++++++
 backends/platform/sdl/posix/posix.h   | 2 ++
 3 files changed, 14 insertions(+)

(limited to 'backends/platform/sdl/posix')

diff --git a/backends/platform/sdl/posix/main.cpp b/backends/platform/sdl/posix/main.cpp
index cf1bc6ff2f..5f734e6b0e 100644
--- a/backends/platform/sdl/posix/main.cpp
+++ b/backends/platform/sdl/posix/main.cpp
@@ -37,13 +37,19 @@ int main(int argc, char *argv[]) {
 	g_system = new OSystem_POSIX();
 	assert(g_system);
 
+	// Pre initialize the backend
+	((OSystem_POSIX *)g_system)->init();
+
 #ifdef DYNAMIC_MODULES
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
 #endif
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
+
+	// Free OSystem
 	delete (OSystem_POSIX *)g_system;
+
 	return res;
 }
 
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index aec36de910..e92a4398d9 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -44,8 +44,14 @@
 #define DEFAULT_CONFIG_FILE ".scummvmrc"
 
 OSystem_POSIX::OSystem_POSIX() {
+}
+
+void OSystem_Win32::init() {
 	// Initialze File System Factory
 	_fsFactory = new POSIXFilesystemFactory();
+
+	// Invoke parent implementation of this method
+	OSystem_SDL::init();
 }
 
 void OSystem_POSIX::initBackend() {
diff --git a/backends/platform/sdl/posix/posix.h b/backends/platform/sdl/posix/posix.h
index 2e87709598..a8d5e9a23b 100644
--- a/backends/platform/sdl/posix/posix.h
+++ b/backends/platform/sdl/posix/posix.h
@@ -33,6 +33,8 @@ public:
 	OSystem_POSIX();
 	virtual ~OSystem_POSIX() {}
 
+	virtual void init();
+
 	virtual void initBackend();
 
 protected:
-- 
cgit v1.2.3