X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsupertux%2Fresources.cpp;h=012e3138a26fcf67e33b2ec6c6e177565c962fe0;hb=4a3592f77f9c089c33b9eaf2db426999a01b2b78;hp=2d5224b53d81d2125850df429b036e206acae39c;hpb=25a4aafdeaff1cb7b114b27fe2827918df7430f8;p=supertux.git

diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
index 2d5224b53..012e3138a 100644
--- a/src/supertux/resources.cpp
+++ b/src/supertux/resources.cpp
@@ -20,7 +20,6 @@
 #include "gui/mousecursor.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/player_status.hpp"
-#include "supertux/tile_manager.hpp"
 #include "video/font.hpp"
 
 MouseCursor* Resources::mouse_cursor = NULL;
@@ -36,15 +35,15 @@ SurfacePtr Resources::back;
 SurfacePtr Resources::arrow_left;
 SurfacePtr Resources::arrow_right;
 
-/* Load graphics/sounds shared between all levels: */
-void
-Resources::load_shared()
+Resources::Resources()
 {
-  /* Load the mouse-cursor */
-  mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png");
+  // Load the mouse-cursor
+  mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png",
+                                 "images/engine/menu/mousecursor-click.png",
+                                 "images/engine/menu/mousecursor-link.png");
   MouseCursor::set_current(mouse_cursor);
 
-  /* Load global images: */
+  // Load global images:
   fixed_font.reset(new Font(Font::FIXED, "fonts/white.stf"));
   normal_font.reset(new Font(Font::VARIABLE, "fonts/white.stf"));
   small_font.reset(new Font(Font::VARIABLE, "fonts/white-small.stf", 1));
@@ -56,34 +55,28 @@ Resources::load_shared()
   back = Surface::create("images/engine/menu/arrow-back.png");
   arrow_left = Surface::create("images/engine/menu/arrow-left.png");
   arrow_right = Surface::create("images/engine/menu/arrow-right.png");
-
-  tile_manager   = new TileManager();
-  sprite_manager = new SpriteManager();
 }
 
-/* Free shared data: */
-void
-Resources::unload_shared()
+Resources::~Resources()
 {
-  /* Free menu images */
+  // Free menu images
   checkbox.reset();
   checkbox_checked.reset();
   back.reset();
   arrow_left.reset();
   arrow_right.reset();
 
-  /* Free global images: */
+  // Free global images:
   fixed_font.reset();
   normal_font.reset();
   small_font.reset();
   big_font.reset();
 
-  delete sprite_manager;
-  sprite_manager = NULL;
-
   /* Free mouse-cursor */
-  mouse_cursor->cursor.reset();
-  delete mouse_cursor;
+  if(mouse_cursor != NULL)
+  {
+    delete mouse_cursor;
+  }
 }
 
 /* EOF */