PARALLACTION: Adapt to new detection modules and misc changes.

- Move common enums into detection_enums.h
- Make a new module for detection. See previous commit notes for more info.

engines/parallaction/detection/detection.cpp

@@ -27,8 +27,8 @@
 #include "common/system.h"
 #include "common/textconsole.h"
 
-#include "parallaction/parallaction.h"
-#include "parallaction/detection.h"
+#include "parallaction/detection/detection_enums.h"
+#include "parallaction/detection/detection.h"
 
 static const PlainGameDescriptor parallactionGames[] = {
 	{"nippon", "Nippon Safes Inc."},

engines/parallaction/detection/detection_enums.h

@@ -0,0 +1,44 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef PARALLACTION_DETECTION_ENUMS_H
+#define PARALLACTION_DETECTION_ENUMS_H
+
+namespace Parallaction {
+
+enum {
+	GF_DEMO = 1 << 0,
+	GF_LANG_EN = 1 << 1,
+	GF_LANG_FR = 1 << 2,
+	GF_LANG_DE = 1 << 3,
+	GF_LANG_IT = 1 << 4,
+	GF_LANG_MULT = 1 << 5
+};
+
+enum ParallactionGameType {
+	GType_Nippon = 1,
+	GType_BRA
+};
+
+} // End of namespace Parallaction
+
+#endif // PARALLACTION_DETECTION_ENUMS_H

engines/parallaction/detection/module.mk

@@ -0,0 +1,4 @@
+MODULE := engines/parallaction/detection
+
+# Detection objects
+DETECT_OBJS += $(MODULE)/detection.o

engines/parallaction/metaengine.cpp

@@ -28,7 +28,7 @@
 #include "common/textconsole.h"
 
 #include "parallaction/parallaction.h"
-#include "parallaction/detection.h"
+#include "parallaction/detection/detection.h"
 
 namespace Parallaction {
 

engines/parallaction/module.mk

@@ -41,6 +41,3 @@ endif
 
 # Include common rules
 include $(srcdir)/rules.mk
-
-# Detection objects
-DETECT_OBJS += $(MODULE)/detection.o

engines/parallaction/parallaction.h

@@ -37,6 +37,7 @@
 #include "parallaction/inventory.h"
 #include "parallaction/objects.h"
 #include "parallaction/disk.h"
+#include "parallaction/detection/detection_enums.h"
 
 #define PATH_LEN	200
 
@@ -65,16 +66,6 @@ enum {
 	kDebugInventory = 1 << 9
 };
 
-enum {
-	GF_DEMO = 1 << 0,
-	GF_LANG_EN = 1 << 1,
-	GF_LANG_FR = 1 << 2,
-	GF_LANG_DE = 1 << 3,
-	GF_LANG_IT = 1 << 4,
-	GF_LANG_MULT = 1 << 5
-};
-
-
 enum EngineFlags {
 	kEnginePauseJobs	= (1 << 1),
 	kEngineWalking		= (1 << 3),
@@ -94,11 +85,6 @@ enum {
 	kEvIngameMenu   = 8000
 };
 
-enum ParallactionGameType {
-	GType_Nippon = 1,
-	GType_BRA
-};
-
 struct PARALLACTIONGameDescription;