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

[Travis Howell]

From: "Max Horn" <max at quendi.de>
>> 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.

The demo check was previously in openRoom(), before the game detection 
changes. I addded the demo check in that position, since it is only required 
when the demo is started under ScummVM.

> 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.

7f45ddd6dbfbf8f80c0c0efea4c295bc is shared by demo and full version of V1 
Maniac Mansion

The demo of V1 Maniac Mansion can be found at 
http://quick.mixnmojo.com/demos/maniac.rar