[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos_start.cpp,1.3,1.4

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory usw-pr-cvs1:/tmp/cvs-serv30167

Modified Files:
	morphos_start.cpp 
Log Message:
Changed WBWINDOW arg/tooltype to WINDOW

Index: morphos_start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_start.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- morphos_start.cpp	15 Sep 2002 09:16:28 -0000	1.3
+++ morphos_start.cpp	23 Sep 2002 19:22:49 -0000	1.4
@@ -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 @@
 		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 @@
 	}
 
 	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));