improved water images a bit

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index 7ab1cbf..39cb26f 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -18,22 +18,17 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
-#include "sprite/sprite_manager.h"
-#include "gui/menu.h"
-#include "gui/button.h"
-#include "resources.h"
-#include "file_system.h"
-#include "tile_manager.h"
-#include "object/gameobjs.h"
-#include "object/player.h"
-
-MusicRef herring_song;
-MusicRef level_end_song;
-MusicRef credits_song;
+#include "sprite/sprite_manager.hpp"
+#include "gui/menu.hpp"
+#include "gui/button.hpp"
+#include "resources.hpp"
+#include "file_system.hpp"
+#include "tile_manager.hpp"
+#include "object/gameobjs.hpp"
+#include "object/player.hpp"
 
 SpriteManager* sprite_manager = 0;
 TileManager* tile_manager = 0;
-SoundManager* sound_manager = 0;
 
 MouseCursor* mouse_cursor = 0;
 
@@ -122,6 +117,7 @@ void load_shared()
   /* Tux life: */
   tux_life = new Surface("images/creatures/tux_small/tux-life.png", true);
 
+#if 0
   /* Sound effects: */
   sound_manager->preload_sound("jump");
   sound_manager->preload_sound("bigjump");
@@ -144,10 +140,7 @@ void load_shared()
   sound_manager->preload_sound("explosion");
   sound_manager->preload_sound("warp");
   sound_manager->preload_sound("fireworks");
-
-  /* Herring song */
-  herring_song = sound_manager->load_music("music/salcon.mod");
-  level_end_song = sound_manager->load_music("music/leveldone.mod");
+#endif
 }
 
 /* Free shared data: */