X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=921e4d50a45c8e82fa89152f2e5c2d138beadbc6;hb=aea1b715f22599f5e202693cb93a0852704d6422;hp=60f6799f86c7853b37f19dab201a64932898b166;hpb=26203547402f3c010560ea5f50bd488e6a9ef0ac;p=supertux.git

diff --git a/src/resources.cpp b/src/resources.cpp
index 60f6799f8..921e4d50a 100644
--- 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,14 +48,17 @@ 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");
   largetux_star = sprite_manager->load("largetux-star");
   smalltux_gameover = sprite_manager->load("smalltux-gameover");
 
+  growingtux_left = sprite_manager->load("tux-grow-left");
+  growingtux_right = sprite_manager->load("tux-grow-right");
+
   smalltux.stand_left  = sprite_manager->load("smalltux-stand-left");
   smalltux.stand_right = sprite_manager->load("smalltux-stand-right");
   smalltux.walk_left   = sprite_manager->load("smalltux-walk-left");
@@ -97,6 +102,22 @@ void loadshared()
   firetux.duck_left   = sprite_manager->load("firetux-duck-left");
   firetux.duck_right  = sprite_manager->load("firetux-duck-right");
 
+  icetux.stand_left  = sprite_manager->load("icetux-stand-left");
+  icetux.stand_right = sprite_manager->load("icetux-stand-right");
+  icetux.walk_left   = sprite_manager->load("icetux-walk-left");
+  icetux.walk_right  = sprite_manager->load("icetux-walk-right");
+  icetux.jump_left   = sprite_manager->load("icetux-jump-left");
+  icetux.jump_right  = sprite_manager->load("icetux-jump-right");
+  icetux.kick_left   = sprite_manager->load("icetux-kick-left");
+  icetux.kick_right  = sprite_manager->load("icetux-kick-right");
+  icetux.skid_right  = sprite_manager->load("icetux-skid-right");
+  icetux.skid_left   = sprite_manager->load("icetux-skid-left");
+  icetux.grab_left   = sprite_manager->load("icetux-grab-left");
+  icetux.grab_right  = sprite_manager->load("icetux-grab-right");
+  icetux.duck_left   = sprite_manager->load("icetux-duck-left");
+  icetux.duck_right  = sprite_manager->load("icetux-duck-right");
+
+
   /* Water: */
   img_water = new Surface(datadir + "/images/shared/water.png", IGNORE_ALPHA);
 
@@ -159,6 +180,9 @@ void loadshared()
   /* Upgrades: */
   load_special_gfx();
 
+  /* Objects */
+  load_object_gfx();
+
   /* Distros: */
   img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png",
                USE_ALPHA);
@@ -191,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");
 }
 
 
@@ -228,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 */