Updated with latest from trunk

svn-id: r53976

6 files changed, 55 insertions, 15 deletions

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 2f4e78fd80..cf59ae6dfd 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -219,6 +219,14 @@ void registerDefaults() {
 	ConfMan.registerDefault("record_file_name", "record.bin");
 	ConfMan.registerDefault("record_temp_file_name", "record.tmp");
 	ConfMan.registerDefault("record_time_file_name", "record.time");
+
+#if 0
+	// NEW CODE TO HIDE CONSOLE FOR WIN32
+#ifdef WIN32
+	// console hiding for win32
+	ConfMan.registerDefault("show_console", false);
+#endif
+#endif
 }
 
 //
@@ -546,6 +554,15 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 			END_OPTION
 #endif
 
+#if 0
+	// NEW CODE TO HIDE CONSOLE FOR WIN32
+#ifdef WIN32
+			// console hiding for win32
+			DO_LONG_OPTION_BOOL("show-console")
+			END_OPTION
+#endif
+#endif
+
 unknownOption:
 			// If we get till here, the option is unhandled and hence unknown.
 			usage("Unrecognized option '%s'", argv[i]);
@@ -578,6 +595,10 @@ static void listTargets() {
 	using namespace Common;
 	const ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
 	ConfigManager::DomainMap::const_iterator iter;
+
+	Common::Array<Common::String> targets;
+	targets.reserve(domains.size());
+
 	for (iter = domains.begin(); iter != domains.end(); ++iter) {
 		Common::String name(iter->_key);
 		Common::String description(iter->_value.getVal("description"));
@@ -592,9 +613,13 @@ static void listTargets() {
 				description = g.description();
 		}
 
-		printf("%-20s %s\n", name.c_str(), description.c_str());
-
+		targets.push_back(Common::String::printf("%-20s %s", name.c_str(), description.c_str()));
 	}
+
+	Common::sort(targets.begin(), targets.end());
+
+	for (Common::Array<Common::String>::const_iterator i = targets.begin(), end = targets.end(); i != end; ++i)
+		printf("%s\n", i->c_str());
 }
 
 /** List all saves states for the given target. */
@@ -950,9 +975,9 @@ Common::Error processSettings(Common::String &command, Common::StringMap &settin
 		if (dir && *dir && strlen(dir) < MAXPATHLEN) {
 			Common::FSNode saveDir(dir);
 			if (!saveDir.exists()) {
-				warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored.");
+				warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored");
 			} else if (!saveDir.isWritable()) {
-				warning("Non-writable SCUMMVM_SAVEPATH save path. It will be ignored.");
+				warning("Non-writable SCUMMVM_SAVEPATH save path. It will be ignored");
 			} else {
 				settings["savepath"] = dir;
 			}
diff --git a/base/internal_version.h b/base/internal_version.h
index 5fd0535142..2b00ce60d2 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -3,7 +3,7 @@
 #endif
 
 #ifndef SCUMMVM_SVN_REVISION
-#define SCUMMVM_SVN_REVISION
+#define SCUMMVM_SVN_REVISION ""
 #endif
 
 #ifdef RELEASE_BUILD
@@ -11,4 +11,4 @@
 #define SCUMMVM_SVN_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.2.0svn" SCUMMVM_SVN_REVISION
+#define SCUMMVM_VERSION "1.3.0svn" SCUMMVM_SVN_REVISION
diff --git a/base/internal_version.h.in b/base/internal_version.h.in
index adf5f94d21..dacaf72d40 100644
--- a/base/internal_version.h.in
+++ b/base/internal_version.h.in
@@ -3,7 +3,7 @@
 #endif
 
 #ifndef SCUMMVM_SVN_REVISION
-#define SCUMMVM_SVN_REVISION
+#define SCUMMVM_SVN_REVISION "@SVN_REVISION@"
 #endif
 
 #ifdef RELEASE_BUILD
diff --git a/base/main.cpp b/base/main.cpp
index b925391a96..37e100b49f 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -315,7 +315,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	Common::StringMap settings;
 	command = Base::parseCommandLine(settings, argc, argv);
 
-	// Load the config file (possibly overriden via command line):
+	// Load the config file (possibly overridden via command line):
 	if (settings.contains("config")) {
 		ConfMan.loadConfigFile(settings["config"]);
 		settings.erase("config");
@@ -326,9 +326,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	// Update the config file
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
 
-	// Enable translation
-	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
-
 	// Load and setup the debuglevel and the debug flags. We do this at the
 	// soonest possible moment to ensure debug output starts early on, if
 	// requested.
@@ -440,9 +437,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			PluginManager::instance().loadPlugins();
 #endif
 		} else {
-			// A dialog would be nicer, but we don't have any
-			// screen to draw on yet.
-			warning("%s", _("Could not find any engine capable of running the selected game"));
 			GUI::displayErrorDialog(_("Could not find any engine capable of running the selected game"));
 		}
 
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 2e08dabc3f..d2fad34579 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -121,6 +121,9 @@ public:
 		#if PLUGIN_ENABLED_STATIC(KYRA)
 		LINK_PLUGIN(KYRA)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(LASTEXPRESS)
+		LINK_PLUGIN(LASTEXPRESS)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(LURE)
 		LINK_PLUGIN(LURE)
 		#endif
@@ -154,12 +157,21 @@ public:
 		#if PLUGIN_ENABLED_STATIC(SWORD2)
 		LINK_PLUGIN(SWORD2)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(SWORD25)
+		LINK_PLUGIN(SWORD25)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TEENAGENT)
 		LINK_PLUGIN(TEENAGENT)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(TESTBED)
+		LINK_PLUGIN(TESTBED)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TINSEL)
 		LINK_PLUGIN(TINSEL)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(TOON)
+		LINK_PLUGIN(TOON)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TOUCHE)
 		LINK_PLUGIN(TOUCHE)
 		#endif
@@ -203,13 +215,14 @@ public:
 		LINK_PLUGIN(ADLIB)
 		LINK_PLUGIN(PCSPK)
 		LINK_PLUGIN(PCJR)
+		LINK_PLUGIN(CMS)
 		#ifndef DISABLE_SID
 		LINK_PLUGIN(C64)
 		#endif
 		LINK_PLUGIN(AMIGA)
 		LINK_PLUGIN(APPLEIIGS)
 		LINK_PLUGIN(TOWNS)
-		#if defined (UNIX)
+		#if defined(USE_TIMIDITY)
 		LINK_PLUGIN(TIMIDITY)
 		#endif
 
diff --git a/base/version.cpp b/base/version.cpp
index 055067a656..6967263f5c 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -92,6 +92,10 @@ const char *gScummVMFeatures = ""
 	"SEQ "
 #endif
 
+#ifdef USE_TIMIDITY
+	"TiMidity "
+#endif
+
 #ifdef USE_RGB_COLOR
 	"RGB "
 #endif
@@ -107,5 +111,9 @@ const char *gScummVMFeatures = ""
 #ifdef USE_FLUIDSYNTH
 	"FluidSynth "
 #endif
+
+#ifdef USE_THEORADEC
+	"Theora "
+#endif
 	;