split worldmap into several files, updates, use SDL_Delay earlier to reduce CPU usage...

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index 7d909b6..940b0a0 100644 (file)
--- 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: */
@@ -113,9 +104,6 @@ void load_shared()
   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;