diff options
| author | Ruediger Hanke | 2002-12-02 19:03:07 +0000 |
|---|---|---|
| committer | Ruediger Hanke | 2002-12-02 19:03:07 +0000 |
| commit | c65be6ce08fa3dbf4347e4656f83f824db69e2f4 (patch) | |
| tree | 770cf1de2bcd7d25c5508815f196065c9257a948 /backends/morphos/morphos_start.cpp | |
| parent | 31dec80d39a0cd7965eed3b583d253ddfc574cf2 (diff) | |
| download | scummvm-rg350-c65be6ce08fa3dbf4347e4656f83f824db69e2f4.tar.gz scummvm-rg350-c65be6ce08fa3dbf4347e4656f83f824db69e2f4.tar.bz2 scummvm-rg350-c65be6ce08fa3dbf4347e4656f83f824db69e2f4.zip | |
Latest MorphOS changes from my harddisk ...
svn-id: r5816
Diffstat (limited to 'backends/morphos/morphos_start.cpp')
| -rw-r--r-- | backends/morphos/morphos_start.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp index 8b6177039a..118a054452 100644 --- a/backends/morphos/morphos_start.cpp +++ b/backends/morphos/morphos_start.cpp @@ -31,7 +31,6 @@ #include <proto/exec.h> #include <proto/dos.h> #include <proto/cdda.h> -#include <proto/cybergraphics.h> #include <proto/icon.h> #include "stdafx.h" @@ -44,7 +43,7 @@ extern "C" WBStartup *_WBenchMsg; // For command line parsing -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"; +static STRPTR usageTemplate = "STORY,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; @@ -64,7 +63,6 @@ static BPTR OrigDirLock = 0; Library *CDDABase = NULL; Library *TimerBase = NULL; -struct Library* CyberGfxBase = NULL; OSystem_MorphOS *TheSystem = NULL; @@ -118,9 +116,6 @@ void close_resources() if (CDDABase) CloseLibrary(CDDABase); - - if (CyberGfxBase) - CloseLibrary(CyberGfxBase); } static STRPTR FindMusicDriver(STRPTR argval) @@ -254,10 +249,6 @@ int main() char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14]; int argc = 0; - CyberGfxBase = OpenLibrary("cybergraphics.library",50); - if (CyberGfxBase == NULL) - exit(1); - InitSemaphore(&ScummSoundThreadRunning); InitSemaphore(&ScummMusicThreadRunning); @@ -365,7 +356,8 @@ int main() sprintf(talkspeed, "-y%d", ScummTalkSpeed); argv[argc++] = talkspeed; } - argv[argc++] = ScummStory; + if (ScummStory) + argv[argc++] = ScummStory; return morphos_main(argc, argv); } |