Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Type
Description
This pull modifies how the game detects mercenary installation. Only Win32 had been properly implemented, and in many cases the registry values the game checked for do not exist. Mercenary must still be present to use the Black Pyro ship in multiplayer.
The source previously only attempted to load hogfiles
extra.hog
andmerc.hog
. On CD installations, this file combination is present. However, in digital installations, the file combination isextra1.hog
andextra.hog
. This pull also correctly detects both combinations.Fixes #255
Checklist
Additional Comments
Tested in windows only. Needs multiplatform testing. If the Mercenary hogfile is loaded, the player should be able to select the Black Pyro at the pilot config screen, provided they have cleared Mercenary Level 2. Also, when using the Black Pyro, the guidebot should be red.