aboutsummaryrefslogtreecommitdiff
path: root/engines/macventure
diff options
context:
space:
mode:
authorBorja Lorente2016-08-17 15:50:18 +0200
committerBorja Lorente2016-08-19 16:30:24 +0200
commit12ce17d90c8409c29cb8f88d9af3ffd6a28bd459 (patch)
tree2534723ed5a2f3edcea0c4c01ebef3d4e0c41418 /engines/macventure
parentd8e4d18f7a2226aec3010683de8f40dee3b7e831 (diff)
downloadscummvm-rg350-12ce17d90c8409c29cb8f88d9af3ffd6a28bd459.tar.gz
scummvm-rg350-12ce17d90c8409c29cb8f88d9af3ffd6a28bd459.tar.bz2
scummvm-rg350-12ce17d90c8409c29cb8f88d9af3ffd6a28bd459.zip
MACVENTURE: Merge detection tables into detection.cpp
Diffstat (limited to 'engines/macventure')
-rw-r--r--engines/macventure/detection.cpp13
-rw-r--r--engines/macventure/detection_tables.h35
2 files changed, 11 insertions, 37 deletions
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index 9329a9a185..2b161142c4 100644
--- a/engines/macventure/detection.cpp
+++ b/engines/macventure/detection.cpp
@@ -29,13 +29,22 @@
namespace MacVenture {
+#define ADGF_DEFAULT (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_MACRESFORK)
+
+#define BASEGAME(n, v, f, md5, s) {n, v, AD_ENTRY1s(f, md5, s), Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEFAULT, GUIO0()}
+
+static const ADGameDescription gameDescriptions[] = {
+ BASEGAME("shadowgate", "Zojoi Rerelease", "Shadowgate.bin", "ebbfbcbf93938bd2900cb0c0213b19ad", 68974), // Zojoi Rerelease
+ BASEGAME("deja_vu", "Zojoi Rerelease", "Deja Vu.bin", "5e9f5a8e3c8eb29ed02b34ae5937354f", 69034), // Zojoi Rerelease
+ BASEGAME("deja_vu2", "Zojoi Rerelease", "Lost in Las Vegas.bin", "8f8e1d8d41f577ee0fbc03847969af0d", 66520), // Zojoi Rerelease
+ AD_TABLE_END_MARKER
+};
+
const char *MacVentureEngine::getGameFileName() const {
return _gameDescription->filesDescriptions[0].fileName;
}
} // End of namespace MacVenture
-#include "macventure/detection_tables.h"
-
static const PlainGameDescriptor macventureGames[] = {
{ "shadowgate", "Shadowgate" },
{ "deja_vu", "Deja Vu"},
diff --git a/engines/macventure/detection_tables.h b/engines/macventure/detection_tables.h
deleted file mode 100644
index 6ba51e0086..0000000000
--- a/engines/macventure/detection_tables.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 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.
-*
-*/
-
-namespace MacVenture {
-
-#define ADGF_DEFAULT (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_MACRESFORK)
-
-#define BASEGAME(n, v, f, md5, s) {n, v, AD_ENTRY1s(f, md5, s), Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEFAULT, GUIO0()}
-
-static const ADGameDescription gameDescriptions[] = {
- BASEGAME("shadowgate", "Zojoi Rerelease", "Shadowgate.bin", "ebbfbcbf93938bd2900cb0c0213b19ad", 68974), // Zojoi Rerelease
- BASEGAME("deja_vu", "Zojoi Rerelease", "Deja Vu.bin", "5e9f5a8e3c8eb29ed02b34ae5937354f", 69034), // Zojoi Rerelease
- BASEGAME("deja_vu2", "Zojoi Rerelease", "Lost in Las Vegas.bin", "8f8e1d8d41f577ee0fbc03847969af0d", 66520), // Zojoi Rerelease
- AD_TABLE_END_MARKER
-};
-} // End of namespace MacVenture