Skip to content
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

wolf4sdl: game data (Spear of Destiny) #3445

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

s1eve-mcdichae1
Copy link
Contributor

@s1eve-mcdichae1 s1eve-mcdichae1 commented Dec 11, 2021

In the Wolfenstein 3D docs we are instructed to rename three files from the Spear of Destiny expansion from extension .sod to .sd1. (Presumably because the source files are available in both forms and so no one way is going to work in the scripts without some renaming.)

(Edit):

It seems that Steam provides the games with .sd1 files, while original installation media ("Spear of Destiny: Super CD Pack") uses .sod.

Although we can make it work with both names.

(Renaming to .sd1 broke compatibility with RetroPie-Extra's ecwolf package, but the same file runs fine when named .sod.)

wolf4sdl can run it with either name but the command is different either way. With .sd1 it needs to have the --mission 1 option, and with .sod it needs to NOT have that option.

This change checks for all three versions (sod, sd1, and the shareware sdm) before downloading shareware data, and uses the correct command for each one.

(Original):

But then the install script still checks for the old .sod file when determining whether to download the shareware version. So even if we have the registered version files, if we rename them as instructed then the shareware will still be downloaded, because the filenames don't match what is being checked for.

It still works (I'll change this from "bug" to "QOL"), it just always downloads the shareware, whether it is needed or not.

This should fix it so it will search for the correct file. I also added a function that should automatically rename the .sod files so we don't have to do it manually.

@s1eve-mcdichae1 s1eve-mcdichae1 changed the title Update function game_data_wolf4sdl() wolf4sdl: (bug) fix check for game data Feb 10, 2022
@s1eve-mcdichae1 s1eve-mcdichae1 changed the title wolf4sdl: (bug) fix check for game data wolf4sdl: (QOL) fix check for game data Feb 10, 2022
@s1eve-mcdichae1
Copy link
Contributor Author

s1eve-mcdichae1 commented Aug 15, 2022

Alternatively, make it work with either name.

Renaming to .sd1 broke compatibility with RetroPie-Extra's ecwolf package.

wolf4sdl can run it with either name but the command is different (vswap.sd1 needs to have the --mission 1 option, and vswap.sod needs to NOT have that option.)

This change:

  • uses the correct command for each filename,
  • checks for all three versions (sod, sd1, sdm) before downloading shareware data, and
  • creates the proper launch script for each version that exists.

(I can squash this if it is to be accepted.)

Check for '.sd1' wad file in addition to '.sod' before downloading shareware version.

Choose correct launch command opts by wad file name.
@s1eve-mcdichae1 s1eve-mcdichae1 changed the title wolf4sdl: (QOL) fix check for game data wolf4sdl: game data Mar 12, 2023
@s1eve-mcdichae1 s1eve-mcdichae1 changed the title wolf4sdl: game data wolf4sdl: game data (Spear of Destiny) Mar 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant