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
I believe some changes from #591 broke loading levels or anything that loads dynamic libs from hog files (at least on Windows). Instead of loading the new x64 DLLs from d3-win.hog, the old x86 DLLs from the original game data are loaded, which fails spectacularly.
There is this comment still, that isn't true anymore:
Descent3/Descent3/init.cpp
Lines 1504 to 1505 in 3a7c86a
Osiris_ExtractScriptsFromHog()
will happily overwrite existing entries of foo.dll inOSIRIS_Extracted_scripts
with the last loaded temp filename from either d3.hog or any .mn3 file loaded at level start.Trying to fix the problem, I asked myself: Why do we even load the old dynamic libs at all? We extract both old and new libs to the temp directory, only to ignore the old ones and only load the new ones. We can skip all that and only extract and load the new ones. Which this PR tries to do.
On Linux/Mac we might have a subtle difference. Since the original builds are already x64 and loading the old dynamic libs might just work, without us realizing that we don't load our new/fixed code from d3-linux|mac.hog.
Related Issues
Screenshots (if applicable)
Checklist
Additional Comments