[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.74,1.75
Max Horn
fingolfin at users.sourceforge.net
Tue Apr 19 13:23:21 CEST 2005
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12884/base
Modified Files:
main.cpp
Log Message:
Added new (optional) OSystem::initBackend() method; this (and its usage) fixes bugs #1160977 and #1184664
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- main.cpp 31 Mar 2005 05:35:03 -0000 1.74
+++ main.cpp 19 Apr 2005 20:22:48 -0000 1.75
@@ -368,6 +368,10 @@
// Load the plugins
PluginManager::instance().loadPlugins();
+ // Ensure the system object exists (it may have already been created
+ // at an earlier point, though!)
+ OSystem &system = OSystem::instance();
+
// Parse the command line information
#ifndef _WIN32_WCE
GameDetector detector;
@@ -378,9 +382,9 @@
ArgsFree(argv);
#endif
- // Ensure the system object exists (it may have already been created
- // at an earlier point, though!)
- OSystem &system = OSystem::instance();
+ // Init the backend. Must take place after all config data (including
+ // the command line params) was read.
+ system.initBackend();
// Create the timer services
g_timer = new Timer(&system);
More information about the Scummvm-git-logs
mailing list