Reworked code in the advanced game detector (getting rid of much of the evil #define hell it consisted of previously)

svn-id: r24685

2 files changed, 5 insertions, 3 deletions

diff --git a/base/game.h b/base/game.h
index cdafb2f2ca..cb95f1730e 100644
--- a/base/game.h
+++ b/base/game.h
@@ -25,6 +25,7 @@
 #define BASE_GAME_H
 
 #include "common/str.h"
+#include "common/array.h"
 
 struct PlainGameDescriptor {
 	const char *gameid;
@@ -53,6 +54,10 @@ struct GameDescriptor {
 		gameid(g.gameid), description(g.description) {}
 };
 
+/** List of games. */
+typedef Common::Array<GameDescriptor> GameList;
+
+
 
 class Plugin;
 
diff --git a/base/plugins.h b/base/plugins.h
index e5a6882e39..9b14f52d57 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -35,9 +35,6 @@ class Engine;
 class FSList;
 class OSystem;
 
-/** List of games. */
-typedef Common::Array<GameDescriptor> GameList;
-
 /**
  * A detected game. Carries the GameDescriptor, but also (optionally)
  * information about the language and platform of the detected game.