introduce a new SoundManager class and merged MusicManager with it. Using this class...

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index fcd4d62..921e4d5 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -25,6 +25,7 @@
 #include "special.h"
 #include "resources.h"
 #include "sprite_manager.h"
+#include "sound_manager.h"
 #include "setup.h"
 
 Surface* img_waves[3]; 
@@ -33,12 +34,13 @@ Surface* img_pole;
 Surface* img_poletop;
 Surface* img_flag[2];
 Surface* img_cloud[2][4];
+Surface* img_distro[4];
 
 MusicRef herring_song;
 MusicRef level_end_song;
 
 SpriteManager* sprite_manager = 0;
-MusicManager* music_manager = 0;
+SoundManager* sound_manager = 0;
 
 /* Load graphics/sounds shared between all levels: */
 void loadshared()
@@ -46,8 +48,8 @@ void loadshared()
   int i;
 
   sprite_manager = new SpriteManager(datadir + "/supertux.strf");
-  music_manager = new MusicManager();
-  music_manager->enable_music(use_music);
+  sound_manager = new SoundManager();
+  sound_manager->enable_music(use_music);
 
   /* Tuxes: */
   smalltux_star = sprite_manager->load("smalltux-star");
@@ -213,8 +215,8 @@ void loadshared()
     sounds[i] = load_sound(datadir + soundfilenames[i]);
 
   /* Herring song */
-  herring_song = music_manager->load_music(datadir + "/music/SALCON.MOD");
-  level_end_song = music_manager->load_music(datadir + "/music/tux-leveldone.mod");
+  herring_song = sound_manager->load_music(datadir + "/music/SALCON.MOD");
+  level_end_song = sound_manager->load_music(datadir + "/music/tux-leveldone.mod");
 }
 
 
@@ -250,8 +252,8 @@ void unloadshared(void)
 
   delete sprite_manager;
   sprite_manager = 0;
-  delete music_manager;
-  music_manager = 0;
+  delete sound_manager;
+  sound_manager = 0;
 }
 
 /* EOF */