-
Notifications
You must be signed in to change notification settings - Fork 231
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
Correctly load mercenary assets (extra.hog) #254
Conversation
Some mercenary assets are not loaded properly since merc.hog is named extra.hog in digital releases. Adjust the check here.
Verified working with both combinations on windows. |
56f76b1
to
753cb37
Compare
Tested and verified working in windows. Red guidebot is back! |
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). |
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
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.