Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index 64370ed..60f6799 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -34,9 +34,8 @@ Surface* img_poletop;
 Surface* img_flag[2];
 Surface* img_cloud[2][4];
 
-Surface* img_red_glow;
-
 MusicRef herring_song;
+MusicRef level_end_song;
 
 SpriteManager* sprite_manager = 0;
 MusicManager* music_manager = 0;
@@ -160,10 +159,6 @@ void loadshared()
   /* Upgrades: */
   load_special_gfx();
 
-  /* Weapons: */
-  img_red_glow = new Surface(datadir + "/images/shared/red-glow.png",
-               USE_ALPHA);
-
   /* Distros: */
   img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png",
                USE_ALPHA);
@@ -197,6 +192,7 @@ void loadshared()
 
   /* Herring song */
   herring_song = music_manager->load_music(datadir + "/music/SALCON.MOD");
+  level_end_song = music_manager->load_music(datadir + "/music/tux-leveldone.mod");
 }
 
 
@@ -208,8 +204,6 @@ void unloadshared(void)
   free_special_gfx();
   free_badguy_gfx();
 
-  delete smalltux_gameover;
-
   delete img_water;
   for (i = 0; i < 3; i++)
     delete img_waves[i];
@@ -227,6 +221,8 @@ void unloadshared(void)
       delete img_cloud[1][i];
     }
 
+  delete tux_life;
+
   for (i = 0; i < NUM_SOUNDS; i++)
     free_chunk(sounds[i]);