Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AGI: Add support for Mac Manhunter games #3652

Merged
merged 1 commit into from Jan 16, 2022
Merged

Conversation

@trembyle
Copy link
Contributor

@trembyle trembyle commented Jan 7, 2022

Includes a change to how Mac data files are loaded for three games: Gold Rush and both Manhunter games - all AGI version 3.

I've tested this for all three games and all platforms: Amiga, Atari ST, DOS, Mac, Apple IIgs and Tandy CoCo 3. Testing involved detecting the game files, starting the game, playing the first couple screens, restarting the game, and quitting. Restart was tested because the resources are reloaded on restart.

I also tested the same on the fanmade V: The Graphic Adventure.

Everything seems to work fine. The ST version of MH1 hangs on startup for me, but that happens in the ScummVM 2.5.1 release as well (it's possible that I dumped the disk incorrectly). And the CoCo3 V3 games don't work yet anyway. That's a project for another day.

Macintosh versions of GR and MH1-2 use the same combined directory
filename convention as DOS, Atari ST and Apple IIgs (but not Amiga or
CoCo3). However, the filename convention for volumes uses the common
AGI v2 format, without a game id prefix.

Example:
DOS: GRDIR, GRVOL.x
Mac: GRDIR, VOL.x

To account for this, we'll use the following:
1. Rather than take the directory filename prefix from volume files,
   we now get this from the directory files themselves (which makes
   more sense anyway).
2. Later, when loading individual volumes, check for Mac platform and
   exclude the prefix from the path.

This improves the previous single game check for Mac Gold Rush, which
formed directory and volume paths for that game only. This check is
now obsolete and has been removed. The detection flag that was used to
invoke the workaround has also been removed.
@bluegr
Copy link
Member

@bluegr bluegr commented Jan 16, 2022

Thanks! The changes made also conform to the information found in the AGIWiki:

https://wiki.scummvm.org/index.php?title=AGIWiki/Sierra_Made_Games

The games look to be running fine and the changes are straighforward. Thanks for your work! Merging

@bluegr bluegr merged commit 2334880 into scummvm:master Jan 16, 2022
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants