First part of GSoC2008 RTL branch merge

svn-id: r34241

2 files changed, 8 insertions, 1 deletions

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index f8ca8a90cd..47ba3cb9ed 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -56,6 +56,7 @@ static const char HELP_STRING[] =
 	"  -h, --help               Display a brief help text and exit\n"
 	"  -z, --list-games         Display list of supported games and exit\n"
 	"  -t, --list-targets       Display list of configured targets and exit\n"
+	"  --list-saves=TARGET	    Display a list of savegames for the game (TARGET) specified\n"
 	"\n"
 	"  -c, --config=CONFIG      Use alternate configuration file\n"
 	"  -p, --path=PATH          Path to where the game is installed\n"
diff --git a/base/main.cpp b/base/main.cpp
index 115a920f36..4283b6cacf 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -38,6 +38,7 @@
 #include "base/version.h"
 
 #include "common/config-manager.h"
+#include "common/events.h"
 #include "common/file.h"
 #include "common/fs.h"
 #include "common/system.h"
@@ -200,7 +201,8 @@ static int runGame(const EnginePlugin *plugin, OSystem &system, const Common::St
 	// Reset the file/directory mappings
 	Common::File::resetDefaultDirectories();
 
-	return 0;
+	// If result=1 return to the launcher, else quit ScummVM
+    return result;
 }
 
 
@@ -286,6 +288,10 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 			// TODO: We should keep running if starting the selected game failed
 			// (so instead of just quitting, show a nice error dialog to the
 			// user and let him pick another game).
+		 	
+			// Reset RTL flag in case we want to load another engine
+			g_system->getEventManager()->resetRTL();		
+
 			if (result == 0)
 				break;