Support WadSmoosh for GZDoom's 4.6.0 changes #13
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
GZDoom 4.6.0 changed the AutoName for WadSmoosh: doom.id.doom2.wadsmoosh -> doom.id.wadsmoosh We support this by essentially copying the doom.id.doom2 lump filter folder as doom.id.wadsmoosh. In order to avoid duplicating the supershotgun sprites, however, we move these to doom.id. This is unfortunately complicated by the fact that using the IDKFA cheat will give the player the super shotgun if any of the sht2~ sprites exist. We do not want this behaviour in DOOM 1 IWADs. For this reason, instead of putting the sht2~ supershotgun sprites into the sprites folder, we put them into a placeholder folder so that they are not automatically recognized and imported as sprites. We can then use a textures lump to re-import them as sprites only within the doom.id.doom2 and doom.id.wadsmoosh lump filters. See @madame-rachelle for this method, as used in WidePix: nashmuhandes/WidePix@89dac47 https://forum.zdoom.org/viewtopic.php?p=1190878#p1190878
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.
GZDoom 4.6.0 changed the AutoName for WadSmoosh:
doom.id.doom2.wadsmoosh->doom.id.wadsmooshWe support this by essentially copying the
doom.id.doom2lump filter folder asdoom.id.wadsmoosh. In order to avoid duplicating the supershotgun sprites, however, we move these todoom.id. This is unfortunately complicated by the fact that using the IDKFA cheat will give the player the super shotgun if any of thesht2~sprites exist. We do not want this behaviour in DOOM 1 IWADs. For this reason, instead of putting thesht2~supershotgun sprites into thespritesfolder, we put them into a placeholder folder so that they are not automatically recognized and imported as sprites. We can then use a textures lump to re-import them as sprites only within thedoom.id.doom2anddoom.id.wadsmooshlump filters.See @madame-rachelle for this method, as used in WidePix:
nashmuhandes/WidePix@89dac47
https://forum.zdoom.org/viewtopic.php?p=1190878#p1190878
This PR is designed to merge into master, but I also have a backport of this onto tag-v3.2.1 (3a8972d) if that is easier for a new release. See strangebit:wadsmoosh-gzdoom_4.6.0_onto_tag-3.2.1 (72b277f). It has the exact same set of changes as this, except for one thing: the new
filter/doom.id.wadsmoosh/zscript.zcfile does not includezscript/ZPerkMixin.zc.