Correctly load mercenary assets (extra.hog) #254
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some mercenary assets are not loaded properly since merc.hog is named extra.hog in digital releases. Adjust the check here.
4 tasks
Jayman2000
reviewed
May 1, 2024
|
Verified working with both combinations on windows. |
JeodC
force-pushed
the
JeodC-patch-1
branch
3 times, most recently
from
56f76b1
to
753cb37
Compare
|
Tested and verified working in windows. Red guidebot is back! |
4 tasks
|
This will make an access violation crash if the player attempts to use the black pyro in multiplayer without mercenary hog assets present (missing cockpit graphic for the ship). |
jcoby
reviewed
May 1, 2024
| @@ -1548,40 +1548,6 @@ tTempFileInfo temp_file_wildcards[] = {{"d3s*.tmp"}, {"d3m*.tmp"}, {"d3o*.tmp"}, | |||
| {"d3c*.tmp"}, {"d3t*.tmp"}, {"d3i*.tmp"}}; | |||
| int num_temp_file_wildcards = sizeof(temp_file_wildcards) / sizeof(tTempFileInfo); | |||
|
|
|||
| // Returns true if Mercenary is installed | |||
| bool MercInstalled() { | |||
There was a problem hiding this comment.
instead of blowing this away, how about looking for merc_hid > 0? that'll support CD installs without the merc expansion.
There was a problem hiding this comment.
That's way more elegant. I think I'll do this all locally when I have time to keep from so many commits in the history.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Some mercenary assets are not loaded properly since merc.hog is named extra.hog in digital releases. Adjust the check here. Resolves #255 and enables mercenary stuff for other platforms.