super-tux-commit

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/lib/audio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13367/lib/audio

Modified Files:
	sound_manager.cpp 
Log Message:
move over rewritten lispreader from tuxkart (with additional fixes), generalized TileManager and Tile classes and use them for the worldmap too

Index: sound_manager.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound_manager.cpp	24 Nov 2004 14:10:20 -0000	1.6
+++ sound_manager.cpp	28 Nov 2004 14:56:47 -0000	1.7
@@ -33,7 +33,8 @@
 SoundManager* SoundManager::instance_ = 0;
 
 SoundManager::SoundManager()
-  : current_music(0), m_music_enabled(true) , m_sound_enabled(true) , audio_device(true)
+  : current_music(0), m_music_enabled(true) , m_sound_enabled(true),
+    audio_device(true)
 {
 }
 
@@ -42,8 +43,7 @@
   if(audio_device)
     Mix_HaltMusic();
 
-sounds.clear();
-destroy_instance();
+  sounds.clear();
 }
 
 void
@@ -184,7 +184,8 @@
   if(m_music_enabled == false) {
     Mix_HaltMusic();
   } else {
-    Mix_PlayMusic(current_music->music, -1);
+    if(current_music)
+      Mix_PlayMusic(current_music->music, -1);
   }
 }