aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-05-13 16:56:53 +0000
committerTorbjörn Andersson2005-05-13 16:56:53 +0000
commit564c30a9addf297063deecb41db1e5bb13dd9e63 (patch)
treecb5dd1c1d5b41994f8b877a12f2a814caeae4840
parent15a4e8a0e247bcb82a2c1c8402967e5c86b0f95f (diff)
downloadscummvm-rg350-564c30a9addf297063deecb41db1e5bb13dd9e63.tar.gz
scummvm-rg350-564c30a9addf297063deecb41db1e5bb13dd9e63.tar.bz2
scummvm-rg350-564c30a9addf297063deecb41db1e5bb13dd9e63.zip
Added MD5 for (another) Gobliiins 1 CD. See bug report #1201233. Made a few
other game detection-related changes, but they're mostly cosmetical at this stage. svn-id: r18082
-rw-r--r--gob/gob.cpp24
-rw-r--r--gob/gob.h9
2 files changed, 23 insertions, 10 deletions
diff --git a/gob/gob.cpp b/gob/gob.cpp
index de0ece0088..2068d3cedd 100644
--- a/gob/gob.cpp
+++ b/gob/gob.cpp
@@ -49,18 +49,22 @@ struct GobGameSettings {
};
static const GobGameSettings gob_games[] = {
- {"gob1", "Gobliiins 1 (CD)", 0, "45f9c1162dd7040fd05fd013ccc176e2"},
- {"gob1", "Gobliiins 1 (DOS)", 0, "82aea70ef26f41fa963dfae270993e49"},
- {"gob1", "Gobliiins 1 (Windows)", 0, "8a5e850c49d7cacdba5f5eb1fcc77b89"},
- {"gob1", "Gobliiins 1 (Demo)", 0, "4f5bf4b9e4c39ebb93579747fc678e97"},
-
+ // Supplied by Torbjorn Andersson
+ {"gob1", "Gobliiins 1 (CD)", GF_GOB1, "45f9c1162dd7040fd05fd013ccc176e2"},
+ {"gob1", "Gobliiins 1 (Interactive Demo)", GF_GOB1, "4f5bf4b9e4c39ebb93579747fc678e97"},
#if 0
- // Not supported yet
- {"gob2", "Gobliins 2 (CD)", 0, "410e632682ab11969bc3b3b588066d95"},
- {"gob2", "Gobliins 2 (Demo)", 0, "be8b111191f965ac9b28fe530580d14e"},
- {"gob3", "Goblins Quest 3 (Demo)", 0, "5024e7de8d6377fbbeabbaa92e0452bc"},
- {"woodruff", "The Bizarre Adventures of Woodruff and the Schnibble", 0, "c27402cee260d2ff1c4cecb2006a630a"},
+ {"gob2", "Gobliins 2 (CD)", GF_GOB2, "410e632682ab11969bc3b3b588066d95"},
+ {"gob2", "Gobliins 2 (Demo)", GF_GOB2, "be8b111191f965ac9b28fe530580d14e"},
+ {"gob3", "Goblins Quest 3 (Demo)", GF_GOB3, "5024e7de8d6377fbbeabbaa92e0452bc"},
+ {"woodruff", "The Bizarre Adventures of Woodruff and the Schnibble", GF_WOODRUFF, "c27402cee260d2ff1c4cecb2006a630a"},
#endif
+
+ // Supplied by Theruler76 in bug report #1201233
+ {"gob1", "Gobliiins 1 (CD)", GF_GOB1, "a5e232fcd02733c7dffff107d22d36eb"},
+
+ // Supplied by Florian Zeitz on scummvm-devel
+ {"gob1", "Gobliiins 1 (DOS)", GF_GOB1, "82aea70ef26f41fa963dfae270993e49"},
+ {"gob1", "Gobliiins 1 (Windows)", GF_GOB1, "8a5e850c49d7cacdba5f5eb1fcc77b89"},
{0, 0, 0, 0}
};
diff --git a/gob/gob.h b/gob/gob.h
index fe4ecbe697..6ab7b976cb 100644
--- a/gob/gob.h
+++ b/gob/gob.h
@@ -36,6 +36,15 @@
#define WRITE_VAR_OFFSET(offs, val) (VAR_OFFSET(offs) = (val))
#define WRITE_VAR(var, val) WRITE_VAR_OFFSET((var) << 2, (val))
+// TODO: Should be in the Gob namespace, I guess
+
+enum {
+ GF_GOB1 = 1 << 0,
+ GF_GOB2 = 1 << 1,
+ GF_GOB3 = 1 << 2,
+ GF_WOODRUFF = 1 << 3
+};
+
namespace Gob {
class GobEngine : public Engine {