From eae06884b6c6da23b7932ceba65e435d9be6ef82 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 30 Jun 2011 11:17:58 +1000
Subject: WIN32: Add option to disable the console window, keeping the current
 default of enabling the console window.

---
 base/commandLine.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'base/commandLine.cpp')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 1cd3643f5a..a4fefc413a 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -65,6 +65,9 @@ static const char HELP_STRING[] =
 	"  -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"
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+	"  --console                Enable the console window (default:enabled)\n"
+#endif
 	"\n"
 	"  -c, --config=CONFIG      Use alternate configuration file\n"
 	"  -p, --path=PATH          Path to where the game is installed\n"
@@ -231,13 +234,6 @@ void registerDefaults() {
 	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
 }
 
 //
@@ -554,14 +550,11 @@ 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")
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+			// Optional console window on Windows (default: enabled)
+			DO_LONG_OPTION_BOOL("console")
 			END_OPTION
 #endif
-#endif
 
 unknownOption:
 			// If we get till here, the option is unhandled and hence unknown.
-- 
cgit v1.2.3


From 09501be85bee9f686a7815fc0f47a1e16008f38d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 2 Jul 2011 20:25:32 +0200
Subject: ENGINES: Clean up SaveStateDescriptor.

Now SaveStateDescriptor no longer subclasses HashMap. Instead all possible
saved meta data is included directly into SaveStateDescriptor.

This is slightly less flexible, but we never needed that flexibility so far.
On the other hand it should reduce the memory usage. At least on my system
(Linux/amd64) the old SaveStateDescriptor had a size of 928 and the new
SaveStateDescriptor has a size of 200.
---
 base/commandLine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/commandLine.cpp')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index a4fefc413a..c831cd08fa 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -662,7 +662,7 @@ static Common::Error listSaves(const char *target) {
 				   "  ---- ------------------------------------------------------\n");
 
 			for (SaveStateList::const_iterator x = saveList.begin(); x != saveList.end(); ++x) {
-				printf("  %-4s %s\n", x->save_slot().c_str(), x->description().c_str());
+				printf("  %-4d %s\n", x->getSaveSlot(), x->getDescription().c_str());
 				// TODO: Could also iterate over the full hashmap, printing all key-value pairs
 			}
 		} else {
-- 
cgit v1.2.3


From 19fd9c066cedd7d3e2cc9d1494137766a0a65ceb Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 4 Jul 2011 17:18:08 +0200
Subject: AUDIO: add registerDefault for music_driver

---
 base/commandLine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/commandLine.cpp')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index c831cd08fa..6550f60670 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -184,8 +184,8 @@ void registerDefaults() {
 	ConfMan.registerDefault("native_mt32", false);
 	ConfMan.registerDefault("enable_gs", false);
 	ConfMan.registerDefault("midi_gain", 100);
-//	ConfMan.registerDefault("music_driver", ???);
 
+	ConfMan.registerDefault("music_driver", "auto");
 	ConfMan.registerDefault("mt32_device", "null");
 	ConfMan.registerDefault("gm_device", "null");
 
-- 
cgit v1.2.3