X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=940b0a06bdff6dc892c765df360591c1d9cda39f;hb=9a1687312904d32d5aa53851a24d643c7def02ff;hp=e6583862e9d9d525865886125d2b6c4ff70484d2;hpb=70fdbd45026801f0f0f312278c69b383eaca9d3a;p=supertux.git

diff --git a/src/resources.cpp b/src/resources.cpp
index e6583862e..940b0a06b 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -1,7 +1,8 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
+//  SuperTux
 //  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -27,28 +28,18 @@
 #include "object/gameobjs.hpp"
 #include "object/player.hpp"
 
-SpriteManager* sprite_manager = 0;
-TileManager* tile_manager = 0;
+MouseCursor* mouse_cursor = NULL;
 
-MouseCursor* mouse_cursor = 0;
+Font* gold_text = NULL;
+Font* blue_text = NULL;
+Font* gray_text = NULL;
+Font* white_text = NULL;
+Font* white_small_text = NULL;
+Font* white_big_text = NULL;
 
-Font* gold_text;
-Font* blue_text;
-Font* gray_text;
-Font* white_text;
-Font* white_small_text;
-Font* white_big_text;				    
-				    
 /* Load graphics/sounds shared between all levels: */
 void load_shared()
 {
-  /* Load GUI/menu images: */
-  checkbox = new Surface("images/engine/menu/checkbox-unchecked.png");
-  checkbox_checked = new Surface("images/engine/menu/checkbox-checked.png");
-  back = new Surface("images/engine/menu/arrow-back.png");
-  arrow_left = new Surface("images/engine/menu/arrow-left.png");
-  arrow_right = new Surface("images/engine/menu/arrow-right.png");
-
   /* Load the mouse-cursor */
   mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png");
   MouseCursor::set_current(mouse_cursor);
@@ -75,7 +66,7 @@ void load_shared()
   
   Button::info_font = white_small_text;
 
-  sprite_manager = new SpriteManager("images/sprites.strf");
+  sprite_manager = new SpriteManager();
   tile_manager = new TileManager("images/tiles.strf");
 
   /* Tuxes: */
@@ -91,31 +82,28 @@ void load_shared()
 
   small_tux = new TuxBodyParts();
   small_tux->head = 0;
-  small_tux->body = sprite_manager->create("small-tux-body");
-  small_tux->arms = sprite_manager->create("small-tux-arms");
+  small_tux->body = sprite_manager->create("images/creatures/tux_small/small-tux-body.sprite");
+  small_tux->arms = sprite_manager->create("images/creatures/tux_small/small-tux-arms.sprite");
   small_tux->feet = 0;
 
   big_tux = new TuxBodyParts();
-  big_tux->head = sprite_manager->create("big-tux-head");
-  big_tux->body = sprite_manager->create("big-tux-body");
-  big_tux->arms = sprite_manager->create("big-tux-arms");
-  big_tux->feet = sprite_manager->create("big-tux-feet");
+  big_tux->head = sprite_manager->create("images/creatures/tux_big/big-tux-head.sprite");
+  big_tux->body = sprite_manager->create("images/creatures/tux_big/big-tux-body.sprite");
+  big_tux->arms = sprite_manager->create("images/creatures/tux_big/big-tux-arms.sprite");
+  big_tux->feet = sprite_manager->create("images/creatures/tux_big/big-tux-feet.sprite");
 
   fire_tux = new TuxBodyParts();
-  fire_tux->head = sprite_manager->create("big-fire-tux-head");
-  fire_tux->body = sprite_manager->create("big-tux-body");
-  fire_tux->arms = sprite_manager->create("big-tux-arms");
-  fire_tux->feet = sprite_manager->create("big-tux-feet");
+  fire_tux->head = sprite_manager->create("images/creatures/tux_big/big-fire-tux-head.sprite");
+  fire_tux->body = sprite_manager->create("images/creatures/tux_big/big-tux-body.sprite");
+  fire_tux->arms = sprite_manager->create("images/creatures/tux_big/big-tux-arms.sprite");
+  fire_tux->feet = sprite_manager->create("images/creatures/tux_big/big-tux-feet.sprite");
 
   ice_tux = new TuxBodyParts();
-  ice_tux->head = sprite_manager->create("big-tux-head");
-  ice_tux->body = sprite_manager->create("big-tux-body");
-  ice_tux->arms = sprite_manager->create("big-tux-arms");
-  ice_tux->feet = sprite_manager->create("big-tux-feet");
+  ice_tux->head = sprite_manager->create("images/creatures/tux_big/big-tux-head.sprite");
+  ice_tux->body = sprite_manager->create("images/creatures/tux_big/big-tux-body.sprite");
+  ice_tux->arms = sprite_manager->create("images/creatures/tux_big/big-tux-arms.sprite");
+  ice_tux->feet = sprite_manager->create("images/creatures/tux_big/big-tux-feet.sprite");
 
-  /* Tux life: */
-  tux_life = new Surface("images/creatures/tux_small/tux-life.png");
-  
   player_status = new PlayerStatus();
 }
 
@@ -129,8 +117,6 @@ void unload_shared()
   delete gray_text;
   delete white_small_text;
   delete white_big_text;
-  
-  delete tux_life;
 
   delete small_tux;
   delete big_tux;
@@ -143,16 +129,9 @@ void unload_shared()
   }
 
   delete sprite_manager;
-  sprite_manager = 0;
+  sprite_manager = NULL;
   delete tile_manager;
-  tile_manager = 0;
-
-  /* Free GUI/menu images: */
-  delete checkbox;
-  delete checkbox_checked;
-  delete back;
-  delete arrow_left;
-  delete arrow_right;
+  tile_manager = NULL;
 
   /* Free mouse-cursor */
   delete mouse_cursor;