X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fresources.cpp;h=4e6f6e1f1f84be9b15d3f90ccae59f2635a328a1;hb=d3be1cc7c63d3f8487a26050526802bb76b14e1c;hp=d7e96547755772d2b2467614004a380692864a3f;hpb=8bcdd6a1e7885a8280f999a750ba7a411414ccaf;p=supertux.git

diff --git a/src/resources.cpp b/src/resources.cpp
index d7e965477..4e6f6e1f1 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -20,22 +20,20 @@
 #include <config.h>
 
 #include "sprite/sprite_manager.hpp"
-#include "gui/menu.hpp"
-#include "gui/button.hpp"
 #include "resources.hpp"
 #include "file_system.hpp"
+#include "tile_manager.hpp"
 #include "object/gameobjs.hpp"
 #include "object/player.hpp"
+#include "gui/mousecursor.hpp"
+#include "player_status.hpp"
 
 MouseCursor* mouse_cursor = NULL;
 
-Font* gold_text = NULL;
-Font* gold_fixed_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* fixed_font = NULL;
+Font* normal_font = NULL;
+Font* small_font = NULL;
+Font* big_font = NULL;
 
 /* Load graphics/sounds shared between all levels: */
 void load_shared()
@@ -45,73 +43,14 @@ void load_shared()
   MouseCursor::set_current(mouse_cursor);
 
   /* Load global images: */
-  gold_text  = new Font(Font::VARIABLE,
-                        "images/engine/fonts/gold.png",
-                        "images/engine/fonts/shadow.png", 16, 18);
-  gold_fixed_text  = new Font(Font::FIXED,
-                        "images/engine/fonts/gold.png",
-                        "images/engine/fonts/shadow.png", 16, 18);
-  blue_text  = new Font(Font::VARIABLE,
-                        "images/engine/fonts/blue.png",
-                        "images/engine/fonts/shadow.png", 16, 18, 3);
-  white_text = new Font(Font::VARIABLE,
-                        "images/engine/fonts/white.png",
-                        "images/engine/fonts/shadow.png", 16, 18);
-  gray_text  = new Font(Font::VARIABLE,
-                        "images/engine/fonts/gray.png",
-                       "images/engine/fonts/shadow.png", 16, 18);
-  white_small_text = new Font(Font::VARIABLE,
-                              "images/engine/fonts/white-small.png",
-                              "images/engine/fonts/shadow-small.png", 8, 9, 1);
-  white_big_text = new Font(Font::VARIABLE,
-                            "images/engine/fonts/white-big.png",
-                            "images/engine/fonts/shadow-big.png", 20, 22, 3);
-
-  Menu::default_font  = white_text;
-  Menu::active_font   = blue_text;
-  Menu::deactive_font = gray_text;
-  Menu::label_font    = white_big_text;
-  Menu::field_font    = gold_text;
-
-  Button::info_font = white_small_text;
+  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();
 
-  /* Tuxes: */
-  char img_name[1024];
-  for (int i = 0; i < GROWING_FRAMES; i++)
-    {
-      snprintf(img_name, sizeof(img_name), "images/creatures/tux_grow/left-%i.png", i+1);
-      growingtux_left[i] = new Surface(img_name);
-
-      snprintf(img_name, sizeof(img_name), "images/creatures/tux_grow/right-%i.png", i+1);
-      growingtux_right[i] = new Surface(img_name);
-    }
-
-  small_tux = new TuxBodyParts();
-  small_tux->head = 0;
-  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("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("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("images/creatures/tux_big/big-ice-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");
-
   player_status = new PlayerStatus();
 }
 
@@ -119,23 +58,9 @@ void load_shared()
 void unload_shared()
 {
   /* Free global images: */
-  delete gold_text;
-  delete gold_fixed_text;
-  delete white_text;
-  delete blue_text;
-  delete gray_text;
-  delete white_small_text;
-  delete white_big_text;
-
-  delete small_tux;
-  delete big_tux;
-  delete fire_tux;
-  delete ice_tux;
-
-  for (int i = 0; i < GROWING_FRAMES; i++) {
-    delete growingtux_left[i];
-    delete growingtux_right[i];
-  }
+  delete normal_font;
+  delete small_font;
+  delete big_font;
 
   delete sprite_manager;
   sprite_manager = NULL;