[Scummvm-cvs-logs] SF.net SVN: scummvm: [32745] scummvm/trunk/base/main.cpp

[fingolfin at users.sourceforge.net]

Revision: 32745
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32745&view=rev
Author:   fingolfin
Date:     2008-06-22 03:26:18 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Disabled return to launcher on trunk again

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2008-06-22 05:42:22 UTC (rev 32744)
+++ scummvm/trunk/base/main.cpp	2008-06-22 10:26:18 UTC (rev 32745)
@@ -228,9 +228,7 @@
 	// Reset the file/directory mappings
 	Common::File::resetDefaultDirectories();
 
-
-
-    return 1;   // Changing from return 0, in order to return to launcher
+	return 0;
 }
 
 
@@ -278,6 +276,7 @@
 
 	// Load the plugins.
 	PluginManager::instance().loadPlugins();
+	EngineMan.getPlugins();
 
 	// Process the remaining command line settings. Must be done after the
 	// config file and the plugins have been loaded.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.