Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183

4 files changed, 6 insertions, 12 deletions

diff --git a/base/game.cpp b/base/game.cpp
index 9628543672..e65c891dc7 100644
--- a/base/game.cpp
+++ b/base/game.cpp
@@ -32,10 +32,10 @@ const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const Pla
 	const PlainGameDescriptor *g = list;
 	while (g->gameid) {
 		if (0 == scumm_stricmp(gameid, g->gameid))
-			break;
+			return g;
 		g++;
 	}
-	return g;
+	return 0;
 }
 
 void GameDescriptor::updateDesc(const char *extra) {
diff --git a/base/game.h b/base/game.h
index 18d7967388..b068c300ce 100644
--- a/base/game.h
+++ b/base/game.h
@@ -48,7 +48,7 @@ struct PlainGameDescriptor {
 /**
  * Given a list of PlainGameDescriptors, returns the first PlainGameDescriptor
  * matching the given gameid. If not match is found return 0.
- * The end of the list marked by a PlainGameDescriptor with gameid equal to 0.
+ * The end of the list must marked by a PlainGameDescriptor with gameid equal to 0.
  */
 const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const PlainGameDescriptor *list);
 
diff --git a/base/internal_version.h b/base/internal_version.h
index 069c20b4c9..c867532dd9 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -1 +1 @@
-#define SCUMMVM_VERSION "0.12.0svn"
+#define SCUMMVM_VERSION "0.13.0svn"
diff --git a/base/plugins.h b/base/plugins.h
index 9d3ce97c3b..02116f6433 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -81,17 +81,11 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
 #define STATIC_PLUGIN 1
 #define DYNAMIC_PLUGIN 2
 
-// Note: The spaces around ENABLE_##ID have been added on purpose for
-// MSVC. For some reason, MSVC tries to add the parenthesis after
-// ENABLE_##ID to the check, thus making it false all the time.
-// Please do NOT remove them, otherwise no engine plugins will be
-// registered under MSVC
-
 #define PLUGIN_ENABLED_STATIC(ID) \
-	(defined( ENABLE_##ID ) && !PLUGIN_ENABLED_DYNAMIC(ID))
+	(ENABLE_##ID && !PLUGIN_ENABLED_DYNAMIC(ID))
 
 #define PLUGIN_ENABLED_DYNAMIC(ID) \
-	(defined( ENABLE_##ID ) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES))
+	(ENABLE_##ID && (ENABLE_##ID == DYNAMIC_PLUGIN) && DYNAMIC_MODULES)
 
 /**
  * REGISTER_PLUGIN_STATIC is a convenience macro which is used to declare