removed unused forest map images

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index 1f338a1..92f2f41 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -18,18 +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"
+#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;
 
@@ -117,31 +116,8 @@ 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");
-  sound_manager->preload_sound("skid");
-  sound_manager->preload_sound("coin");
-  sound_manager->preload_sound("invincible");
-  sound_manager->preload_sound("brick");
-  sound_manager->preload_sound("hurt");
-  sound_manager->preload_sound("squish");
-  sound_manager->preload_sound("fall");
-  sound_manager->preload_sound("ricochet");
-  sound_manager->preload_sound("bump-upgrade");
-  sound_manager->preload_sound("upgrade");
-  sound_manager->preload_sound("grow");
-  sound_manager->preload_sound("fire-flower");
-  sound_manager->preload_sound("shoot");
-  sound_manager->preload_sound("lifeup");
-  sound_manager->preload_sound("stomp");
-  sound_manager->preload_sound("kick");
-  sound_manager->preload_sound("explosion");
-  sound_manager->preload_sound("warp");
-  sound_manager->preload_sound("fireworks");
-#endif
+  
+  player_status = new PlayerStatus();
 }
 
 /* Free shared data: */