From babf7ef44c2407cd52000684e3fa08aa63c8b462 Mon Sep 17 00:00:00 2001 From: Neeraj Kumar Date: Mon, 24 May 2010 14:54:50 +0000 Subject: added the testbed engine: basically renamed quux svn-id: r49188 --- base/plugins.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index 6c80da65d4..feead28247 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -163,6 +163,9 @@ public: #if PLUGIN_ENABLED_STATIC(TUCKER) LINK_PLUGIN(TUCKER) #endif + #if PLUGIN_ENABLED_STATIC(TESTBED) + LINK_PLUGIN(TESTBED) + #endif // Music plugins // TODO: Use defines to disable or enable each MIDI driver as a -- cgit v1.2.3 From 06960d33e15bc80f9912fa92f11dd82388199bd6 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 17 Aug 2010 09:28:20 +0000 Subject: HUGO: Adding engine to the main tree svn-id: r52137 --- base/plugins.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index ea3c65684a..b1273b2d21 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -115,6 +115,9 @@ public: #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 -- cgit v1.2.3 From 9efa316a61575bb8c9df0b74880ecb0a786e314c Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 17 Sep 2010 19:13:47 +0000 Subject: RELEASE: This is 1.3.0svn svn-id: r52773 --- base/internal_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/internal_version.h b/base/internal_version.h index 5fd0535142..5a049b0bb8 100644 --- a/base/internal_version.h +++ b/base/internal_version.h @@ -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 -- cgit v1.2.3 From d477d66f49fb37609b6a989425603d470cb09245 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 17 Sep 2010 20:02:29 +0000 Subject: SOUND: Properly add CMS as plugin. svn-id: r52779 --- base/plugins.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index f5e51f3228..ab660488d3 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -206,6 +206,7 @@ public: LINK_PLUGIN(ADLIB) LINK_PLUGIN(PCSPK) LINK_PLUGIN(PCJR) + LINK_PLUGIN(CMS) #ifndef DISABLE_SID LINK_PLUGIN(C64) #endif -- cgit v1.2.3 From c91a07229a8bd841e6b6e77d977254c388a2e407 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Sat, 18 Sep 2010 10:55:16 +0000 Subject: JANITORIAL: Removed most punctuation at end of warning() and error() Our warning() and error() functions always add an exclamation mark to the end of the message anyway. svn-id: r52791 --- base/commandLine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base') diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 2f4e78fd80..6fbdb55506 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -950,9 +950,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; } -- cgit v1.2.3 From cc4a01433517b683ce9db7f912b269fcc9aa3eb3 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Thu, 23 Sep 2010 10:39:59 +0000 Subject: COMMON : Initialize translation after system has been initialized (to be able to access system specific search paths for translations.dat) svn-id: r52865 --- base/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'base') diff --git a/base/main.cpp b/base/main.cpp index e651456ace..4858501126 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -321,9 +321,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. @@ -365,6 +362,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { setupGraphics(system); + // Enable translation + TransMan.setLanguage(ConfMan.get("gui_language").c_str()); + // Init the event manager. As the virtual keyboard is loaded here, it must // take place after the backend is initiated and the screen has been setup system.getEventManager()->init(); -- cgit v1.2.3 From b1f63deba3afe176646dbf9aae5c22cfab453785 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 25 Sep 2010 22:47:00 +0000 Subject: GUI: Partial fix to bug #3075649 Fonts not found with buit-in theme When the locale font are not found when loading the theme, it now fallbacks to default language (i.e. English) and default font. For this to work I had to move the TranslationManager initialization before the Theme is loaded. Therefore it is now initialized when the GuiManager is constructed. svn-id: r52896 --- base/main.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'base') diff --git a/base/main.cpp b/base/main.cpp index 4858501126..dff9a0d564 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -362,9 +362,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { setupGraphics(system); - // Enable translation - TransMan.setLanguage(ConfMan.get("gui_language").c_str()); - // Init the event manager. As the virtual keyboard is loaded here, it must // take place after the backend is initiated and the screen has been setup system.getEventManager()->init(); -- cgit v1.2.3 From cf82bef02ee2941ddad6664e34f3c94e35e015a3 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 8 Oct 2010 22:30:39 +0000 Subject: TOON: Merged Toon engine to ScummVM trunk svn-id: r53087 --- base/plugins.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index ab660488d3..42fdf9bc12 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -163,6 +163,9 @@ public: #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 -- cgit v1.2.3 From dbde2e46e3c44a795b8597ea3c2b6c7503dfbbef Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 12 Oct 2010 21:12:50 +0000 Subject: SWORD25: Added detection of libtheora, png an dplugged in the engine svn-id: r53169 --- base/plugins.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index 42fdf9bc12..382f9d3c32 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -154,6 +154,9 @@ 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 -- cgit v1.2.3 From 1842de4b0035854f271a40dcaa514cdba66bcf57 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 12 Oct 2010 21:54:43 +0000 Subject: COMMON: Let --list-targets output all targets in an alphabetical list again. svn-id: r53183 --- base/commandLine.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'base') diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 6fbdb55506..5a45ed74a1 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -578,6 +578,10 @@ static void listTargets() { using namespace Common; const ConfigManager::DomainMap &domains = ConfMan.getGameDomains(); ConfigManager::DomainMap::const_iterator iter; + + Common::Array 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 +596,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::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. */ -- cgit v1.2.3 From 3b81a9489eabad1faa6c67bb0d5685d7a3eb0386 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 13 Oct 2010 00:48:40 +0000 Subject: SOUND: Allow TiMidity support to be disabled via configure. svn-id: r53395 --- base/plugins.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index 382f9d3c32..e2af9328a7 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -219,7 +219,7 @@ public: LINK_PLUGIN(AMIGA) LINK_PLUGIN(APPLEIIGS) LINK_PLUGIN(TOWNS) - #if defined (UNIX) + #if defined(USE_TIMIDITY) LINK_PLUGIN(TIMIDITY) #endif -- cgit v1.2.3 From e9f50882ea5b6beeefa994040be9d3bab6a1f107 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 13 Oct 2010 00:53:53 +0000 Subject: SOUND: Add info about TiMidity support in about dialog. svn-id: r53396 --- base/version.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'base') diff --git a/base/version.cpp b/base/version.cpp index 055067a656..2a6d1bb0c0 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 -- cgit v1.2.3