X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=04bc5725a8072c0f7f57bb6007a62b86ef746cce;hb=4967684276df2b7fe4c948451edd49e558328dca;hp=94e85e1d21541c916a3282af98ee5c5c960605fe;hpb=4a86e3e96802ee182e685eeee3e50091ee564547;p=supertux.git

diff --git a/src/resources.cpp b/src/resources.cpp
index 94e85e1d2..04bc5725a 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -31,6 +31,7 @@
 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;
@@ -45,64 +46,38 @@ void load_shared()
   MouseCursor::set_current(mouse_cursor);
 
   /* Load global images: */
-  gold_text = new Font("images/engine/fonts/gold.png",
-                       "images/engine/fonts/shadow.png", 16, 18);
-  blue_text = new Font("images/engine/fonts/blue.png", 
-                       "images/engine/fonts/shadow.png", 16, 18, 3);
-  white_text = new Font("images/engine/fonts/white.png",
+  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);
-  gray_text = new Font("images/engine/fonts/gray.png",
+  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("images/engine/fonts/white-small.png",
+  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("images/engine/fonts/white-big.png",
+  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::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;
-  
+  Menu::label_font    = white_big_text;
+  Menu::field_font    = gold_text;
+
   Button::info_font = white_small_text;
 
+  tile_manager   = new TileManager();
   sprite_manager = new SpriteManager();
-  tile_manager = new TileManager("images/tiles.strf");
-
-  /* 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-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();
 }
@@ -112,28 +87,19 @@ 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 sprite_manager;
   sprite_manager = NULL;
-  delete tile_manager;
-  tile_manager = NULL;
 
   /* Free mouse-cursor */
   delete mouse_cursor;
-}
 
+  delete player_status;
+  player_status = NULL;
+}