fix gzdoom.pk3 not found error #1665
Merged
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
Move the initialization before BaseFileSearch is called, otherwise GameConfig is used not initialized and it doesn't find the gzdoom.pk3 file. GameConfig used uninitalized was spotted by @LoneFox78.
|
Thanks! |
bob-beck
pushed a commit
to openbsd/ports
that referenced
this pull request
Jul 18, 2022
diff from maintainer Timo Myyrä, thanks! While here sort LIB_DEPENDS. This also backports a fix for the "gzdoom.pk3 not found" error from ZDoom/gzdoom#1665
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.
This is an attempt at fixing #1615.
Move the initialization before BaseFileSearch is called, otherwise GameConfig is used not initialized and it doesn't find the gzdoom.pk3 file.
(GameConfig used uninitalized was spotted by @LoneFox78.)
I'm not familiar with the codebase, but looking at the code C_InitConsole depends on LoadHexFont, and thus on the wad being loaded. I_DetectOS only looks at some hardcoded files and at uname, the rest of the code between the old D_DoomInit position and the new one are just printfs. D_DoomInit doesn't seem to depend on C_InitConsole or I_DetectOS.
With this I'm finally able to run gzdoom 4.8.2 on OpenBSD and it correctly picks up
/usr/local/share/games/doom/gzdoom.pk3