BACKENDS: Add init() to OSystem
This commit is contained in:
parent
ee11bc20b2
commit
9a61a99590
17 changed files with 21 additions and 16 deletions
|
@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_POSIX *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
// Invoke the actual ScummVM main entry point:
|
// Invoke the actual ScummVM main entry point:
|
||||||
int res = scummvm_main(argc, argv);
|
int res = scummvm_main(argc, argv);
|
||||||
|
|
|
@ -32,7 +32,7 @@ int main(int argc, char* argv[]) {
|
||||||
g_system = new OSystem_SDL_Dingux();
|
g_system = new OSystem_SDL_Dingux();
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
((OSystem_SDL_Dingux *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_GPH *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -30,7 +30,7 @@ int main(int argc, char* argv[]) {
|
||||||
g_system = new Maemo::OSystem_SDL_Maemo();
|
g_system = new Maemo::OSystem_SDL_Maemo();
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
((Maemo::OSystem_SDL_Maemo *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_OP *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -40,7 +40,7 @@ extern "C" int Game_Main(char *path, char *) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_POSIX *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre-initialize the backend.
|
// Pre-initialize the backend.
|
||||||
((OSystem_AmigaOS *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_MacOSX *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_POSIX *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_PS3 *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_PSP2 *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_RISCOS *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -46,7 +46,7 @@ public:
|
||||||
* instantiating the backend. Early needed managers are
|
* instantiating the backend. Early needed managers are
|
||||||
* created here.
|
* created here.
|
||||||
*/
|
*/
|
||||||
virtual void init();
|
virtual void init() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the Mixer Manager instance. Not to confuse with getMixer(),
|
* Get the Mixer Manager instance. Not to confuse with getMixer(),
|
||||||
|
|
|
@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_Switch *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_Win32 *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
|
||||||
assert(g_system);
|
assert(g_system);
|
||||||
|
|
||||||
// Pre initialize the backend
|
// Pre initialize the backend
|
||||||
((OSystem_SDL_Symbian *)g_system)->init();
|
g_system->init();
|
||||||
|
|
||||||
#ifdef DYNAMIC_MODULES
|
#ifdef DYNAMIC_MODULES
|
||||||
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
|
||||||
|
|
|
@ -243,6 +243,11 @@ public:
|
||||||
*/
|
*/
|
||||||
void destroy();
|
void destroy();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The following method should be called once, after g_system is created.
|
||||||
|
*/
|
||||||
|
virtual void init() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The following method is called once, from main.cpp, after all
|
* The following method is called once, from main.cpp, after all
|
||||||
* config data (including command line params etc.) are fully loaded.
|
* config data (including command line params etc.) are fully loaded.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue