X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=f0e6037148b82c9ddd25af509dfe35ed87ea4d38;hb=dd9fdb809ad6effa216e4483f099a48ab2814352;hp=2bf601e13718cd5a7aa37af64c2e845f37ee8d5a;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/resources.cpp b/src/resources.cpp
index 2bf601e13..f0e603714 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -28,18 +28,16 @@
 #include "object/gameobjs.hpp"
 #include "object/player.hpp"
 
-SpriteManager* sprite_manager = 0;
-TileManager* tile_manager = 0;
-
-MouseCursor* mouse_cursor = 0;
-
-Font* gold_text;
-Font* blue_text;
-Font* gray_text;
-Font* white_text;
-Font* white_small_text;
-Font* white_big_text;				    
-				    
+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;
+
 /* Load graphics/sounds shared between all levels: */
 void load_shared()
 {
@@ -48,38 +46,47 @@ 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;
 
   sprite_manager = new SpriteManager();
-  tile_manager = new TileManager("images/tiles.strf");
+  tile_manager   = new TileManager("images/tiles.strf");
 
   /* Tuxes: */
   char img_name[1024];
   for (int i = 0; i < GROWING_FRAMES; i++)
     {
-      sprintf(img_name, "images/creatures/tux_grow/left-%i.png", i+1);
+      snprintf(img_name, sizeof(img_name), "images/creatures/tux_grow/left-%i.png", i+1);
       growingtux_left[i] = new Surface(img_name);
 
-      sprintf(img_name, "images/creatures/tux_grow/right-%i.png", i+1);
+      snprintf(img_name, sizeof(img_name), "images/creatures/tux_grow/right-%i.png", i+1);
       growingtux_right[i] = new Surface(img_name);
     }
 
@@ -102,7 +109,7 @@ void load_shared()
   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->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");
@@ -115,6 +122,7 @@ void unload_shared()
 {
   /* Free global images: */
   delete gold_text;
+  delete gold_fixed_text;
   delete white_text;
   delete blue_text;
   delete gray_text;
@@ -132,11 +140,13 @@ void unload_shared()
   }
 
   delete sprite_manager;
-  sprite_manager = 0;
+  sprite_manager = NULL;
   delete tile_manager;
-  tile_manager = 0;
+  tile_manager = NULL;
 
   /* Free mouse-cursor */
   delete mouse_cursor;
-}
 
+  delete player_status;
+  player_status = NULL;
+}