[Scummvm-devel] Re: [Scummvm-cvs-logs] SF.net SVN: scummvm: [22695] scummvm/trunk/tools

[Max Horn]

Am 28.05.2006 um 05:47 schrieb kirben at users.sourceforge.net:

> Revision: 22695
> Author:   kirben
> Date:     2006-05-27 20:47:20 -0700 (Sat, 27 May 2006)
> ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22695&view=rev
>
> Log Message:
> -----------
> Use different method to detect V1 demo of Maniac Mansion, since md5  
> matches the full version
>
> Modified Paths:
> --------------
>     scummvm/trunk/engines/scumm/plugin.cpp
>     scummvm/trunk/engines/scumm/scumm-md5.h
>     scummvm/trunk/engines/scumm/scumm.cpp
>     scummvm/trunk/tools/scumm-md5.txt

[...]

>
> Modified: scummvm/trunk/engines/scumm/scumm.cpp
> ===================================================================
> --- scummvm/trunk/engines/scumm/scumm.cpp	2006-05-28 03:02:54 UTC  
> (rev 22694)
> +++ scummvm/trunk/engines/scumm/scumm.cpp	2006-05-28 03:47:20 UTC  
> (rev 22695)
> @@ -1288,6 +1288,11 @@
>  void ScummEngine_v2::resetScumm() {
>  	ScummEngine::resetScumm();
>
> +	// To detect V1 demo of Maniac Mansion
> +	if (_game.id == GID_MANIAC && !strcmp(_filenamePattern.pattern, "% 
> 02d.MAN")) {
> +		_game.features |= GF_DEMO;
> +	}
> +
>  	if (_game.platform == Common::kPlatformNES) {
>  		initNESMouseOver();
>  		_switchRoomEffect2 = _switchRoomEffect = 6;


That's not a good way to fix it. One of the main points of the  
unified detector code is that there is no special code inside  
ScummEngine needed anymore to further distinguish variants. All that  
work should and can be done in detectGames().

So that check should be moved there. Ideally, in fact, it could be  
based on GameFilenamePattern::variant, not on hardcoding the file  
pattern itself.

I'll be happy to work on this, if somebody could tell me what the  
"duplicate" MD5 is, resp. where I can find the affected demo.


Cheers,
Max