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

Add correct and complete Quake dumps, and id Anthology 4 #12793

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

chungy
Copy link
Contributor

@chungy chungy commented Sep 19, 2024

The "quake" entry was a bad dump, it lacked the game's audio tracks even though official shareware releases include them. The main "quake" entry has been replaced with the 1.06 full version, and correct shareware dumps are added in addition.

id Anthology had previously marked discs 3 and 4 as "nodump"; disc 3 of the id Anthology is identical to the standalone Quake 1.06 release (here as "quake"), and disc 4 is Macintosh software, so it is moved to mac_cdrom.xml with the proper hash.

I could, perhaps, include id Anthology disc 3, but since it's identical to "quake", I don't think that duplication is appropriate. It might be worthwhile putting note for the frontend pointing to where it is. I don't know the proper procedure for a disc that's duplicated in two releases.

The existing "quake" entry had only the data track, even though all
official CDs contain the complete set of audio tracks.  Replaced it
with "quake_sw" that contains the entire disc.

Quake 1.06 was chosen as the main entry rather than 1.09 due to it
still having the DOS installer, which may make it more useful for DOS
machines in MAME than the primarily-Windows 1.09 release from 2001.
These two discs were marked as "nodump" and this commit corrects that.
Disc 3 is identical to the standard Quake 1.06 standalone release,
added in the previous commit as plain "quake".

Disc 4 contains Macintosh versions of Wolfenstein 3D and Doom, and
hence is placed in the mac_cdrom.xml software list rather than
ibm5170_cdrom.xml with the other discs.
@ICEknigh7
Copy link
Contributor

and disc 4 is Macintosh software, so it is moved to mac_cdrom.xml with the proper hash.

Would this be a good time to create a multiplatform_cdrom.xml softlist for these cases?

Another solution for it could be to have a more general cdrom.xml with the compatibility flags choosing which entries to show for each system, but that might be slower and wouldn't look as nice as having separate per-system folders.

@rb6502
Copy link
Contributor

rb6502 commented Sep 22, 2024

PC/Mac multiplatform CDs were common enough in the 90s that we do want to create some sort of shared software list, like how my upcoming "Apple Developer CDs" software list is Apple II/Mac. I'm not completely sure what it should be named, but the need is definitely there.

@FoxhackDN
Copy link
Contributor

FoxhackDN commented Sep 22, 2024

Another solution for it could be to have a more general cdrom.xml with the compatibility flags choosing which entries to show for each system, but that might be slower and wouldn't look as nice as having separate per-system folders.

Considering the amount of hybrid PC+Mac discs that are out there, let alone ones with binaries for multiple CPU architectures and operating systems, I think this would be the better choice. Edit: In most cases. Stuff that's actually platform specific like Arbee's Dev CDs can go to a specialized list.

It would take a really long time to set up but it would be worth it.

@chungy
Copy link
Contributor Author

chungy commented Sep 22, 2024

and disc 4 is Macintosh software, so it is moved to mac_cdrom.xml with the proper hash.

Would this be a good time to create a multiplatform_cdrom.xml softlist for these cases?

Another solution for it could be to have a more general cdrom.xml with the compatibility flags choosing which entries to show for each system, but that might be slower and wouldn't look as nice as having separate per-system folders.

id Anthology was a single release, but the discs were split clean by platform. The first three were only for the PC, while the fourth was only for the Macintosh. (and the third is just identical to the "quake 1.06.chd" image I added here, so I opted against duplicating it in the same system...)

Multi-platform CDs are definitely a thing, and one such was added in bebfd94 -- I just duplicated Chex Quest across both systems. As a singular example, it's maybe OK, but it's a problem in need of a solution when more and more multi-platform discs get added.

I also commented on my NT pull request shortly before your own comment, since NT 3.x/4.0 also need a good multi-platform solution. They don't officially support the Mac platform, but they do support four different architectures with the same CD images.

@rb6502
Copy link
Contributor

rb6502 commented Sep 22, 2024

I feel like it'd be weird to break up id Anthology, regardless of the platforms being a clean break by disc. So I think it'd be a good thing to start off a multi-platform software list with.

And someone recently wrote the missing HAL to make NT install and run on some Power Macintoshes. https://github.com/Wack0/maciNTosh

@ICEknigh7
Copy link
Contributor

ICEknigh7 commented Sep 22, 2024

id Anthology was a single release, but the discs were split clean by platform. The first three were only for the PC, while the fourth was only for the Macintosh. (and the third is just identical to the "quake 1.06.chd" image I added here, so I opted against duplicating it in the same system...)

To avoid duplication in these cases (and other compilations with the original CDs included such as Lucasarts Archives), perhaps allowing MAME to use part aliases could be a solution, something like:

	<software name="idanthola" cloneof= "idanthol">
		<description>id Anthology</description>
		<year>1996</year>
		<publisher>id Software</publisher>
		<part name="cdrom1" interface="cdrom">
			<diskarea name="cdrom">
				<disk name="id Anthology (USA) (Disc 1) (Vintage)" sha1="f2e0dcc8252d0b11cc770452f6513fc1d2653452" />
			</diskarea>
		</part>
		<part name="cdrom2" interface="cdrom">
			<diskarea name="cdrom">
				<disk name="id Anthology (USA) (Disc 2) (Doom)" sha1="b32a547d78a19d2e0a47fdfc64e270b2ecfa000e" />
			</diskarea>
		</part>
		<part name="cdrom3" interface="cdrom" aliasof="ibm5170_cdrom/quake/cdrom1>
		</part>
	</software>

@chungy
Copy link
Contributor Author

chungy commented Sep 22, 2024

And someone recently wrote the missing HAL to make NT install and run on some Power Macintoshes. https://github.com/Wack0/maciNTosh

I know, but I said official support. Someone else writing the drivers to make NT PowerPC work on a Mac doesn't count as official. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants