aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2007-03-06 07:13:22 +0000
committerTravis Howell2007-03-06 07:13:22 +0000
commitace739eafb318b2fc0c84c99ac087ba0f29b3b7f (patch)
treeaf978043e2f5fbfb8234032e7bddbb5bb068a033 /engines/scumm
parenta0d5795ee19200f459e2638de53a1a5399994b18 (diff)
downloadscummvm-rg350-ace739eafb318b2fc0c84c99ac087ba0f29b3b7f.tar.gz
scummvm-rg350-ace739eafb318b2fc0c84c99ac087ba0f29b3b7f.tar.bz2
scummvm-rg350-ace739eafb318b2fc0c84c99ac087ba0f29b3b7f.zip
Fix regression in V0 versions of Maniac Mansion, when using extracted files.
svn-id: r26000
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/plugin.cpp4
-rw-r--r--engines/scumm/verbs.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index d2d242f26b..22bdc7bed9 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -1264,10 +1264,10 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com
}
} else if ((buf[0] == 0xCE && buf[1] == 0xF5) || // PC
(buf[0] == 0xCD && buf[1] == 0xFE)) { // Commodore 64
- // Looks like V1.
+ // Could be V0 or V1.
// Candidates: maniac classic, zak classic
- if (g->version != 1)
+ if (g->version >= 2)
return false;
// Zak has 58.LFL, Maniac doesn't have it.
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 404d6b5a71..2287d42f19 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -83,7 +83,6 @@ static const VerbSettings v0VerbTable_German[] = {
{15, 23, 2, 0, "Benutz"}
};
-// TODO: Move actor names to better location
void ScummEngine_v0::resetVerbs() {
VirtScreen *virt = &virtscr[kVerbVirtScreen];
VerbSlot *vs;