Skip to content

Commit

Permalink
Snowberry: Use "-iwad" when addon is an IWAD file
Browse files Browse the repository at this point in the history 
Needs testing with the next build to see if this is a sufficient fix.

IssueID #2034
  • Loading branch information
@skyjake
skyjake committed May 14, 2015
1 parent c19ab46 commit f9a121a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions snowberry/sb/addon.py
View file
Expand Up @@ -635,6 +635,11 @@ def getType(self):
def isPWAD(self):
"""Determines if this addon is a PWAD addon."""
return self.wadType == 'PWAD'

def getCommandLine(self, profile):
if self.isPWAD():
return Addon.getCommandLine(self, profile)
return '-iwad ' + paths.quote(self.source)

def readMetaData(self):
"""Generate metadata by making guesses based on the WAD file
Expand Down

3 comments on commit f9a121a

@danij-deng
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without knowing how Snowberry uses this function I can't say whether this is correct or not. However, Doomsday expects the following:

  • Game required/startup data files are loaded with -iwad
  • All addon data files are loaded with -file regardless of whether the file is marked as an PWAD or not.

@skyjake
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Snowberry wizard adds hexdd.wad as one the addons to be loaded with the Deathkings profile, leading it to be loaded with -file. However, hexdd.wad is an IWAD, even though it is loaded in addition to hexen.wad, so this commit should cause Snowberry to provide two -iwad options to Doomsday.

@danij-deng
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, that sounds right to me then 👍

Please sign in to comment.