diff options
author | Simon Howard | 2011-03-06 22:42:12 +0000 |
---|---|---|
committer | Simon Howard | 2011-03-06 22:42:12 +0000 |
commit | dbdd53e7734b1166185a9906897d5dc87fd95376 (patch) | |
tree | 49d2ba05f5dee53a6aa052ed8027e07cd404d25f /pkg/osx/IWADController.m | |
parent | 97ddedc959ecf361cc7ff2d9055aa4899252bccb (diff) | |
parent | 68f51552ff65668deaeef923fc8c496d64ea9a60 (diff) | |
download | chocolate-doom-dbdd53e7734b1166185a9906897d5dc87fd95376.tar.gz chocolate-doom-dbdd53e7734b1166185a9906897d5dc87fd95376.tar.bz2 chocolate-doom-dbdd53e7734b1166185a9906897d5dc87fd95376.zip |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2293
Diffstat (limited to 'pkg/osx/IWADController.m')
-rw-r--r-- | pkg/osx/IWADController.m | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/pkg/osx/IWADController.m b/pkg/osx/IWADController.m index 3c596850..6cab7ff2 100644 --- a/pkg/osx/IWADController.m +++ b/pkg/osx/IWADController.m @@ -33,6 +33,8 @@ typedef enum IWAD_TNT, IWAD_PLUTONIA, IWAD_CHEX, + IWAD_HERETIC, + IWAD_HEXEN, NUM_IWAD_TYPES } IWAD; @@ -42,7 +44,9 @@ static NSString *IWADLabels[NUM_IWAD_TYPES] = @"Doom II: Hell on Earth", @"Final Doom: TNT: Evilution", @"Final Doom: Plutonia Experiment", - @"Chex Quest" + @"Chex Quest", + @"Heretic", + @"Hexen" }; static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = @@ -52,6 +56,8 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = @"tnt.wad", @"plutonia.wad", @"chex.wad", + @"heretic.wad", + @"hexen.wad", @"undefined" }; @@ -64,6 +70,8 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = iwadList[IWAD_TNT] = self->tnt; iwadList[IWAD_PLUTONIA] = self->plutonia; iwadList[IWAD_CHEX] = self->chex; + iwadList[IWAD_HERETIC] = self->heretic; + iwadList[IWAD_HEXEN] = self->hexen; } - (IWAD) getSelectedIWAD @@ -102,6 +110,27 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = } } +// Get the name used for the executable for the selected IWAD. + +- (const char *) getGameName +{ + IWAD selectedIWAD; + + selectedIWAD = [self getSelectedIWAD]; + + switch (selectedIWAD) + { + case IWAD_HERETIC: + return "heretic"; + + case IWAD_HEXEN: + return "hexen"; + + default: + return "doom"; + } +} + - (void) setIWADConfig { IWADLocation *iwadList[NUM_IWAD_TYPES]; @@ -250,6 +279,10 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = - (void) awakeFromNib { + // TODO: This is temporary: + self->heretic = self->doom1; + self->hexen = self->doom2; + [self->configWindow center]; // Set configuration for all IWADs from configuration file. |