X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=935b69d0541af59df7623f0606b74620a451f611;hb=ff29f47f799d99cec7c2a6aa2cf818da2b931fc5;hp=05c7e196fbdfd38d549e7231a98d97394d8bf46b;hpb=14c23210702eee8191dd122f98ef4e43d57295b7;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 05c7e19..935b69d 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -467,9 +467,6 @@ void FadeLoadingScreen(float howmuch)
     swap_gl_buffers();
 }
 
-
-extern bool cmdline(const char *cmd);
-
 void Game::InitGame()
 {
     LOGFUNC;
@@ -583,15 +580,14 @@ void Game::InitGame()
 #if PLATFORM_LINUX
     unsigned char rc = 0;
     int output = OPENAL_OUTPUT_ALSA;  // Try alsa first...
-    if (cmdline("forceoss"))      //  ...but let user override that.
-        output = OPENAL_OUTPUT_OSS;
-    else if (cmdline("nosound"))
-        output = OPENAL_OUTPUT_NOSOUND;
+    if (commandLineOptions[SOUND]) {
+        output = commandLineOptions[SOUND].last()->type(); //  ...but let user override that.
+    }
 
     OPENAL_SetOutput(output);
     if ((rc = OPENAL_Init(44100, 32, 0)) == false) {
         // if we tried ALSA and failed, fall back to OSS.
-        if ( (output == OPENAL_OUTPUT_ALSA) && (!cmdline("forcealsa")) ) {
+        if ( (output == OPENAL_OUTPUT_ALSA) && (commandLineOptions[SOUND].last()->type() != OPENAL_OUTPUT_ALSA) ) {
             OPENAL_Close();
             output = OPENAL_OUTPUT_OSS;
             OPENAL_SetOutput(output);