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: Expand unsupported Mac detection #3644

Closed
wants to merge 1 commit into from
Closed

Conversation

@trembyle
Copy link
Contributor

@trembyle trembyle commented Jan 4, 2022

This one needs some help from @sev- or someone who has access to the disks in the existing Mac detection entries, as my files usually didn't match what was already in the tables. Should I be extracting the data and resource forks separately, or can we use MacBinary? If the latter, should we add ADGF_MACRESFORK?

I have matching version numbers and dates but different md5 for KQ2, KQ3, SQ1, SQ2. Additionally, my copy of SQ1 has separate interpreters for black & white and 16 colors. Despite matching version/date, neither of them match what's already in detection.

I have earlier version numbers for Gold Rush and PQ1 but later dates than the entries in detection. These could potentially be explained if the earlier versions have been patched to add color support.

And these are probably okay:

  • 3 new entries for LSL1, all with later version/dates than the existing entry
  • Early black & white version of KQ1. The existing entry was v2.0C, mostly likely in color.
  • Entries for both Manhunters, neither of which were previously in detection
@einstein95
Copy link
Contributor

@einstein95 einstein95 commented Jan 4, 2022

Looking at KQ2, the only data files that have resource forks are Palette and ListMgr.rsrc. Keeping only the data forks of the other files lets it pass detection.

@trembyle
Copy link
Contributor Author

@trembyle trembyle commented Jan 4, 2022

@einstein95 has brought it to my attention that at least some Mac games do start, albeit without their Mac menus and icon bars. I'll test these further and mark as unstable if they do.

Also, with the confirmation that discrete resource / data forks are required, I'll redump my files and see if that clears up any of the md5 differences.

Added both Manhunters to detection tables. They don't start yet,
although I may be able to fix that.

Additionally I marked the existing entries as unstable, since they
lack Mac-specific features (menus, icon bar, etc.). I'm probably
going to amend this commit again to remove that flag, since the games
do indeed run, so there's not much benefit to making this change.
@trembyle
Copy link
Contributor Author

@trembyle trembyle commented Jan 5, 2022

Upon further review, I've confirmed that I am able to detect and start my Mac files via the existing Mac detection entries. In many cases, I think that this is too permissive, since I probably do have different versions for some games.

But since there is future work to be done to support Mac-specific features, like the Mac GUI menus and icon bars, I'll leave the code mostly as is for now. I'll close the pull request and commit minor changes directly.

@trembyle trembyle closed this Jan 5, 2022
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