[ scummvm-Bugs-2819628 ] DETECTOR: Atlantis CD sets wrong gui options

[SourceForge.net]

Bugs item #2819628, was opened at 2009-07-10 17:08
Message generated for change (Tracker Item Submitted) made by salty-horse
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=418820&aid=2819628&group_id=37116

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: MD5 checksums / Detector
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Ori Avtalion (salty-horse)
Assigned to: Nobody/Anonymous (nobody)
Summary: DETECTOR: Atlantis CD sets wrong gui options

Initial Comment:
Using latest r42333.

When detecting the Fate of Atlantis CD version, the game options that are set to it are those of the floppy version: sndNoSpeech.
It should have no restrictions.

Here's what I discovered:

The detected MD5Table struct entry for the game has "CD" in the "extra" field (which scumm-md5.txt calls the "Description" field).
According to the comment in scumm-md5.txt, that field is used to distinguish between variants.

The game has two variants:

	{"atlantis", 0, 0, GID_INDY4,    5, 0, MDT_ADLIB | MDT_MIDI, 0, UNK, GUIO_NOSPEECH},
	{"atlantis", "CD" , 0, GID_INDY4,    5, 0, MDT_ADLIB | MDT_MIDI, 0, UNK, GUIO_NONE},

The distinguishing data between the two is the "variant" field of the GameSettings struct.
The comment in engines/scumm/detection.h says 'it matches the "extra" data in scumm-md5.txt'.

The computeGameSettingsFromMD5() function, which should select the correct variant entry for the game, completely ignores MD5Entry's "extra" field.

It *does* compare MD5Entry's "variant" field with the "variant" field of GameSettings, but since the "variant" field of all md5 entries for atlantis is "", it will always select the first variant, which is the floppy version of the game.

Perhaps the "extra" information needs to be compared against too, now that ScummVM cares about features such as speech availability.
Another alternative is to merge that extra information into the "variant" field.

In any case, the field descriptions in scumm-md5.txt should match the "generated" struct field names.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=418820&aid=2819628&group_id=37116