forgot an assert

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index acf4465..16a9cd0 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -140,29 +140,34 @@ static void init_physfs(const char* argv0)
   dir += "/data";
   std::string testfname = dir;
   testfname += "/credits.txt";
+  bool sourcedir = false;
   FILE* f = fopen(testfname.c_str(), "r");
   if(f) {
     fclose(f);
     if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
       std::cout << "Warning: Couldn't add '" << dir 
                 << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+    } else {
+      sourcedir = true;
     }
   }
 
+  if(!sourcedir) {
 #if defined(APPDATADIR) || defined(ENABLE_BINRELOC)
-  std::string datadir;
+    std::string datadir;
 #ifdef ENABLE_BINRELOC
-  char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME);
-  datadir = brdatadir;
-  free(brdatadir);
+    char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME);
+    datadir = brdatadir;
+    free(brdatadir);
 #else
-  datadir = APPDATADIR;
+    datadir = APPDATADIR;
 #endif
-  if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
-    std::cout << "Couldn't add '" << datadir
-              << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
-  }
+    if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
+      std::cout << "Couldn't add '" << datadir
+        << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+    }
 #endif
+  }
 
   // allow symbolic links
   PHYSFS_permitSymbolicLinks(1);
@@ -350,32 +355,13 @@ static void init_audio()
 {
   sound_manager = new SoundManager();
   
-  int format = MIX_DEFAULT_FORMAT;
-  if(Mix_OpenAudio(config->audio_frequency, format, config->audio_channels,
-                   config->audio_chunksize) < 0) {
-    std::cerr << "Couldn't initialize audio ("
-              << config->audio_frequency << "HZ, " << config->audio_channels
-              << " Channels, Format " << format << ", ChunkSize "
-              << config->audio_chunksize << "): " << SDL_GetError() << "\n";
-    return;
-  }
-  sound_manager->set_audio_device_available(true);
   sound_manager->enable_sound(config->sound_enabled);
   sound_manager->enable_music(config->music_enabled);
-  
-  if(Mix_AllocateChannels(config->audio_voices) < 0) {
-    std::cerr << "Couldn't allocate '" << config->audio_voices << "' audio voices: "
-              << SDL_GetError() << "\n";
-    return;
-  }
 }
 
 static void quit_audio()
 {
   if(sound_manager) {
-    if(sound_manager->audio_device_available())
-      Mix_CloseAudio();
-
     delete sound_manager;
     sound_manager = 0;
   }
@@ -411,15 +397,14 @@ void wait_for_event(float min_delay, float max_delay)
     }
     if(SDL_GetTicks() - ticks >= (max - min))
       running = false;
+    sound_manager->update();
     SDL_Delay(10);
   }
 }
 
 int main(int argc, char** argv) 
 {
-#ifndef DEBUG // we want backtraces in debug mode so don't catch exceptions
   try {
-#endif
     srand(time(0));
     init_physfs(argv[0]);
     init_sdl();
@@ -448,8 +433,6 @@ int main(int argc, char** argv)
       // normal game
       title();
     }    
-    
-#ifndef DEBUG
   } catch(std::exception& e) {
     std::cerr << "Unexpected exception: " << e.what() << std::endl;
     return 1;
@@ -457,7 +440,6 @@ int main(int argc, char** argv)
     std::cerr << "Unexpected exception." << std::endl;
     return 1;
   }
-#endif
 
   free_menu();
   unload_shared();