Reduced magic block's hitbox a bit so adjacent blocks can become solid again.

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index 2bf601e..215d6d5 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -28,18 +28,15 @@
 #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* 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()
 {
@@ -50,7 +47,7 @@ void load_shared()
   /* 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", 
+  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",
                         "images/engine/fonts/shadow.png", 16, 18);
@@ -66,7 +63,7 @@ void load_shared()
   Menu::deactive_font = gray_text;
   Menu::label_font = white_big_text;
   Menu::field_font = gold_text;
-  
+
   Button::info_font = white_small_text;
 
   sprite_manager = new SpriteManager();
@@ -76,10 +73,10 @@ void load_shared()
   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 +99,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");
@@ -132,11 +129,10 @@ 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;
 }
-