Rudimentary approach at water splash effect for badguys

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

diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
index 9391eaa..012e313 100644 (file)
--- a/src/supertux/resources.cpp
+++ b/src/supertux/resources.cpp
@@ -14,58 +14,69 @@
 //
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//#include <config.h>
 
-//#include "supertux/resources.hpp"
+#include "supertux/resources.hpp"
 
 #include "gui/mousecursor.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/player_status.hpp"
-#include "supertux/tile_manager.hpp"
 #include "video/font.hpp"
 
-MouseCursor* mouse_cursor = NULL;
+MouseCursor* Resources::mouse_cursor = NULL;
 
-Font* fixed_font = NULL;
-Font* normal_font = NULL;
-Font* small_font = NULL;
-Font* big_font = NULL;
+FontPtr Resources::fixed_font;
+FontPtr Resources::normal_font;
+FontPtr Resources::small_font;
+FontPtr Resources::big_font;
 
-/* Load graphics/sounds shared between all levels: */
-void 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: */
-  fixed_font = new Font(Font::FIXED, "fonts/white.stf");
-  normal_font = new Font(Font::VARIABLE, "fonts/white.stf");
-  small_font = new Font(Font::VARIABLE, "fonts/white-small.stf", 1);
-  big_font = new Font(Font::VARIABLE, "fonts/white-big.stf", 3);
-
-  tile_manager   = new TileManager();
-  sprite_manager = new SpriteManager();
+  // 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));
 
-  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 unload_shared()
+Resources::~Resources()
 {
-  /* Free global images: */
-  delete normal_font;
-  delete small_font;
-  delete big_font;
+  // Free menu images
+  checkbox.reset();
+  checkbox_checked.reset();
+  back.reset();
+  arrow_left.reset();
+  arrow_right.reset();
 
-  delete sprite_manager;
-  sprite_manager = NULL;
+  // Free global images:
+  fixed_font.reset();
+  normal_font.reset();
+  small_font.reset();
+  big_font.reset();
 
   /* Free mouse-cursor */
-  delete mouse_cursor;
-
-  delete player_status;
-  player_status = NULL;
+  if(mouse_cursor != NULL)
+  {
+    delete mouse_cursor;
+  }
 }
 
 /* EOF */