aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuediger Hanke2002-09-23 19:22:49 +0000
committerRuediger Hanke2002-09-23 19:22:49 +0000
commite244ddf42677ca16e917d7609dca0005a41bf0e8 (patch)
treef284e3201d4cd9d8446f2547607ebed0139dbe42
parentd5aeb9254e4ce64cf7d457cae7b2b830670d54af (diff)
downloadscummvm-rg350-e244ddf42677ca16e917d7609dca0005a41bf0e8.tar.gz
scummvm-rg350-e244ddf42677ca16e917d7609dca0005a41bf0e8.tar.bz2
scummvm-rg350-e244ddf42677ca16e917d7609dca0005a41bf0e8.zip
Changed WBWINDOW arg/tooltype to WINDOW
svn-id: r5011
-rw-r--r--backends/morphos/morphos_start.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp
index f30ab92674..82c582d84a 100644
--- a/backends/morphos/morphos_start.cpp
+++ b/backends/morphos/morphos_start.cpp
@@ -43,8 +43,8 @@
extern "C" WBStartup *_WBenchMsg;
// For command line parsing
-static STRPTR usageTemplate = "STORY/A,DATAPATH/K,WBWINDOW/S,SCALER/K,AMIGA/S,MIDIUNIT/K/N,MUSIC/K,MUSICVOL/K/N,SFXVOL/K/N,TEMPO/K/N,TALKSPEED/K/N,NOSUBTITLES=NST/S";
-typedef enum { USG_STORY = 0, USG_DATAPATH, USG_WBWINDOW, USG_SCALER, USG_AMIGA, USG_MIDIUNIT, USG_MUSIC, USG_MUSICVOL, USG_SFXVOL, USG_TEMPO, USG_TALKSPEED, USG_NOSUBTITLES } usageFields;
+static STRPTR usageTemplate = "STORY/A,DATAPATH/K,WINDOW/S,SCALER/K,AMIGA/S,MIDIUNIT/K/N,MUSIC/K,MUSICVOL/K/N,SFXVOL/K/N,TEMPO/K/N,TALKSPEED/K/N,NOSUBTITLES=NST/S";
+typedef enum { USG_STORY = 0, USG_DATAPATH, USG_WINDOW, USG_SCALER, USG_AMIGA, USG_MIDIUNIT, USG_MUSIC, USG_MUSICVOL, USG_SFXVOL, USG_TEMPO, USG_TALKSPEED, USG_NOSUBTITLES } usageFields;
static LONG args[13] = { (ULONG) NULL, (ULONG) NULL, FALSE, (ULONG) NULL, false, (ULONG) NULL, (ULONG) NULL, (ULONG) NULL, (ULONG) NULL, (ULONG) NULL, (ULONG) NULL, false };
static RDArgs *ScummArgs = NULL;
@@ -155,12 +155,12 @@ static void ReadToolTypes(WBArg *OfFile)
strcat(ScummPath, ToolValue);
}
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "WBWINDOW"))
+ if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "WINDOW"))
{
if (MatchToolValue(ToolValue, "YES"))
- args[USG_WBWINDOW] = TRUE;
+ args[USG_WINDOW] = TRUE;
else if (MatchToolValue(ToolValue, "NO"))
- args[USG_WBWINDOW] = FALSE;
+ args[USG_WINDOW] = FALSE;
}
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SCALER"))
@@ -321,11 +321,11 @@ int main()
}
argv[argc++] = "ScummVM";
- if (ScummPath) argv[argc++] = ScummPath;
- if (!args[ USG_WBWINDOW ]) argv[argc++] = "-f";
- if (args[ USG_NOSUBTITLES ]) argv[argc++] = "-n";
- if (args[ USG_AMIGA ]) argv[argc++] = "-a";
- if (args[ USG_MUSIC ]) argv[argc++] = ScummMusicDriver;
+ if (ScummPath) argv[argc++] = ScummPath;
+ if (!args[USG_WINDOW]) argv[argc++] = "-f";
+ if (args[USG_NOSUBTITLES]) argv[argc++] = "-n";
+ if (args[USG_AMIGA]) argv[argc++] = "-a";
+ if (args[USG_MUSIC]) argv[argc++] = ScummMusicDriver;
if (ScummGfxScaler != ST_INVALID)
{
sprintf(scaler, "-g%s", MorphOSScaler::GetParamName(ScummGfxScaler));