[Scummvm-cvs-logs] SF.net SVN: scummvm: [26000] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 26000
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26000&view=rev
Author:   kirben
Date:     2007-03-05 23:13:22 -0800 (Mon, 05 Mar 2007)

Log Message:
-----------
Fix regression in V0 versions of Maniac Mansion, when using extracted files.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
    scummvm/trunk/engines/scumm/verbs.cpp

Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2007-03-06 07:09:18 UTC (rev 25999)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2007-03-06 07:13:22 UTC (rev 26000)
@@ -1264,10 +1264,10 @@
 			}
 		} 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.

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2007-03-06 07:09:18 UTC (rev 25999)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2007-03-06 07:13:22 UTC (rev 26000)
@@ -83,7 +83,6 @@
 	{15, 23, 2,   0, "Benutz"}
 };
 
-// TODO: Move actor names to better location
 void ScummEngine_v0::resetVerbs() {
 	VirtScreen *virt = &virtscr[kVerbVirtScreen];
 	VerbSlot *vs;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.