hopefully fixed the crash on exit, keep sectors script bundled in the sector and...

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index e1ac72f..fdb043f 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -42,13 +42,6 @@ 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 +68,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,34 +84,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");
-
-  /* Objects */
-  load_object_gfx();
+  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();
 }
 
@@ -132,10 +119,6 @@ void unload_shared()
   delete gray_text;
   delete white_small_text;
   delete white_big_text;
-  
-  free_object_gfx();
-
-  delete tux_life;
 
   delete small_tux;
   delete big_tux;
@@ -152,13 +135,6 @@ void unload_shared()
   delete tile_manager;
   tile_manager = 0;
 
-  /* Free GUI/menu images: */
-  delete checkbox;
-  delete checkbox_checked;
-  delete back;
-  delete arrow_left;
-  delete arrow_right;
-
   /* Free mouse-cursor */
   delete mouse_cursor;
 }