Explicitly defined the angle used by Particles, used new definition for particles...

[supertux.git] / src / supertux / resources.cpp

diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
index 6e4c203..012e313 100644 (file)
--- 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;
@@ -30,44 +29,54 @@ FontPtr Resources::normal_font;
 FontPtr Resources::small_font;
 FontPtr Resources::big_font;
 
-/* Load graphics/sounds shared between all levels: */
-void
-Resources::load_shared()
+SurfacePtr Resources::checkbox;
+SurfacePtr Resources::checkbox_checked;
+SurfacePtr Resources::back;
+SurfacePtr Resources::arrow_left;
+SurfacePtr Resources::arrow_right;
+
+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));
   big_font.reset(new Font(Font::VARIABLE, "fonts/white-big.stf", 3));
 
-  tile_manager   = new TileManager();
-  sprite_manager = new SpriteManager();
-
-  player_status = new PlayerStatus();
+  /* Load menu images */
+  checkbox = Surface::create("images/engine/menu/checkbox-unchecked.png");
+  checkbox_checked = Surface::create("images/engine/menu/checkbox-checked.png");
+  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");
 }
 
-/* Free shared data: */
-void
-Resources::unload_shared()
+Resources::~Resources()
 {
-  /* Free global images: */
+  // Free menu images
+  checkbox.reset();
+  checkbox_checked.reset();
+  back.reset();
+  arrow_left.reset();
+  arrow_right.reset();
+
+  // Free global images:
   fixed_font.reset();
   normal_font.reset();
   small_font.reset();
   big_font.reset();
 
-  delete sprite_manager;
-  sprite_manager = NULL;
-
   /* Free mouse-cursor */
-  delete mouse_cursor;
-
-  delete player_status;
-  player_status = NULL;
+  if(mouse_cursor != NULL)
+  {
+    delete mouse_cursor;
+  }
 }
 
 /* EOF */