Merge branch 'master' of github.com:scummvm/scummvm into mortevielle

Conflicts:
	base/plugins.cpp
	configure

6 files changed, 32 insertions, 106 deletions

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 6fd020cb15..44007c494a 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -237,6 +237,8 @@ void registerDefaults() {
 	ConfMan.registerDefault("record_temp_file_name", "record.tmp");
 	ConfMan.registerDefault("record_time_file_name", "record.time");
 
+	ConfMan.registerDefault("gui_saveload_chooser", "grid");
+	ConfMan.registerDefault("gui_saveload_last_pos", "0");
 }
 
 //
diff --git a/base/internal_version.h b/base/internal_version.h
index 5392012169..40ed67ceec 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,4 +16,4 @@
 #define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.5.0git" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "1.6.0git" SCUMMVM_REVISION
diff --git a/base/main.cpp b/base/main.cpp
index c657488758..355a65f883 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -55,6 +55,13 @@
 #include "audio/mididrv.h"
 #include "audio/musicplugin.h"  /* for music manager */
 
+#include "graphics/cursorman.h"
+#include "graphics/fontman.h"
+#include "graphics/yuv_to_rgb.h"
+#ifdef USE_FREETYPE2
+#include "graphics/fonts/ttf.h"
+#endif
+
 #include "backends/keymapper/keymapper.h"
 
 #if defined(_WIN32_WCE)
@@ -493,10 +500,20 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	PluginManager::destroy();
 	GUI::GuiManager::destroy();
 	Common::ConfigManager::destroy();
+	Common::DebugManager::destroy();
+	Common::EventRecorder::destroy();
 	Common::SearchManager::destroy();
 #ifdef USE_TRANSLATION
 	Common::TranslationManager::destroy();
 #endif
+	MusicManager::destroy();
+	Graphics::CursorManager::destroy();
+	Graphics::FontManager::destroy();
+#ifdef USE_FREETYPE2
+	Graphics::shutdownTTF();
+#endif
+	EngineManager::destroy();
+	Graphics::YUVToRGBManager::destroy();
 
 	return 0;
 }
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 1c4e6f1934..b8cd097683 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -85,111 +85,7 @@ public:
 		// Iterate over all registered (static) plugins and load them.
 
 		// Engine plugins
-		#if PLUGIN_ENABLED_STATIC(SCUMM)
-		LINK_PLUGIN(SCUMM)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(AGI)
-		LINK_PLUGIN(AGI)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(AGOS)
-		LINK_PLUGIN(AGOS)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(CGE)
-		LINK_PLUGIN(CGE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(CINE)
-		LINK_PLUGIN(CINE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(COMPOSER)
-		LINK_PLUGIN(COMPOSER)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(CRUISE)
-		LINK_PLUGIN(CRUISE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(DRACI)
-		LINK_PLUGIN(DRACI)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(DRASCULA)
-		LINK_PLUGIN(DRASCULA)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(DREAMWEB)
-		LINK_PLUGIN(DREAMWEB)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(GOB)
-		LINK_PLUGIN(GOB)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(GROOVIE)
-		LINK_PLUGIN(GROOVIE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(HUGO)
-		LINK_PLUGIN(HUGO)
-		#endif
-		#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
-		#if PLUGIN_ENABLED_STATIC(MADE)
-		LINK_PLUGIN(MADE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(MOHAWK)
-		LINK_PLUGIN(MOHAWK)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(MORTEVIELLE)
-		LINK_PLUGIN(MORTEVIELLE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(PARALLACTION)
-		LINK_PLUGIN(PARALLACTION)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(QUEEN)
-		LINK_PLUGIN(QUEEN)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(SAGA)
-		LINK_PLUGIN(SAGA)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(SCI)
-		LINK_PLUGIN(SCI)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(SKY)
-		LINK_PLUGIN(SKY)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(SWORD1)
-		LINK_PLUGIN(SWORD1)
-		#endif
-		#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(TOLTECS)
-		LINK_PLUGIN(TOLTECS)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(TOON)
-		LINK_PLUGIN(TOON)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(TSAGE)
-		LINK_PLUGIN(TSAGE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(TOUCHE)
-		LINK_PLUGIN(TOUCHE)
-		#endif
-		#if PLUGIN_ENABLED_STATIC(TUCKER)
-		LINK_PLUGIN(TUCKER)
-		#endif
+		#include "engines/plugins_table.h"
 
 		// Music plugins
 		// TODO: Use defines to disable or enable each MIDI driver as a
@@ -205,6 +101,9 @@ public:
 		#if defined(USE_SEQ_MIDI)
 		LINK_PLUGIN(SEQ)
 		#endif
+		#if defined(USE_SNDIO)
+		LINK_PLUGIN(SNDIO)
+		#endif
 		#if defined(__MINT__)
 		LINK_PLUGIN(STMIDI)
 		#endif
diff --git a/base/plugins.h b/base/plugins.h
index fffb5fb910..4409c9eaea 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -205,6 +205,10 @@ typedef Common::Array<Plugin *> PluginList;
 template<class PO_t>
 class PluginSubclass : public Plugin {
 public:
+	PO_t &operator*() const {
+		return *(PO_t *)_pluginObject;
+	}
+
 	PO_t *operator->() const {
 		return (PO_t *)_pluginObject;
 	}
diff --git a/base/version.cpp b/base/version.cpp
index 7943552418..89fae90c2e 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -94,6 +94,10 @@ const char *gScummVMFeatures = ""
 	"SEQ "
 #endif
 
+#ifdef USE_SNDIO
+	"sndio "
+#endif
+
 #ifdef USE_TIMIDITY
 	"TiMidity "
 #endif