From 4ab211f6732afb445e8f0e579b9e07b7fbfaa644 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 19 Jul 2008 21:42:31 +0000
Subject: Removed -Wundef from the default list of compiler flags, and changed
 PLUGIN_ENABLED_DYNAMIC to not use 'defined()', thus avoiding compiler
 problems on e.g. BeOS

svn-id: r33114
---
 base/plugins.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'base')

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
-- 
cgit v1.2.3


From 22ab05aa8a8260f6b0863d951025f9c233fd777d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 20 Jul 2008 16:28:06 +0000
Subject: Fixed nasty bug in findPlainGameDescriptor -- contrary to is
 documentation, it would not return 0 upon failure to find a match, but rather
 a (0,0) record.

svn-id: r33136
---
 base/game.cpp | 4 ++--
 base/game.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'base')

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);
 
-- 
cgit v1.2.3


From f82cf58780dde55ad1367a0011ffc7eeed7991c8 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 21 Jul 2008 05:09:29 +0000
Subject: This is 0.13.0svn now

svn-id: r33160
---
 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 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"
-- 
cgit v1.2.3