Removed trailing whitespace from all *.?pp files

[supertux.git] / src / supertux / resources.cpp

diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
index 2d5224b..aed7571 100644 (file)
--- a/src/supertux/resources.cpp
+++ b/src/supertux/resources.cpp
@@ -41,7 +41,9 @@ void
 Resources::load_shared()
 {
   /* Load the mouse-cursor */
-  mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png");
+  mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png",
+                                 "images/engine/menu/mousecursor-click.png",
+                                 "images/engine/menu/mousecursor-link.png");
   MouseCursor::set_current(mouse_cursor);
 
   /* Load global images: */
@@ -66,24 +68,42 @@ void
 Resources::unload_shared()
 {
   /* Free menu images */
-  checkbox.reset();
-  checkbox_checked.reset();
-  back.reset();
-  arrow_left.reset();
-  arrow_right.reset();
+  if(checkbox != NULL)
+    checkbox.reset();
+  if(checkbox_checked != NULL)
+    checkbox_checked.reset();
+  if(back != NULL)
+    back.reset();
+  if(arrow_left != NULL)
+    arrow_left.reset();
+  if(arrow_right != NULL)
+    arrow_right.reset();
 
   /* Free global images: */
-  fixed_font.reset();
-  normal_font.reset();
-  small_font.reset();
-  big_font.reset();
+  if(fixed_font != NULL)
+    fixed_font.reset();
+  if(normal_font != NULL)
+    normal_font.reset();
+  if(small_font != NULL)
+    small_font.reset();
+  if(big_font != NULL)
+    big_font.reset();
 
-  delete sprite_manager;
-  sprite_manager = NULL;
+  /* Free tilesets */
+  delete tile_manager;
+  tile_manager = 0;
+
+  if(sprite_manager != NULL)
+  {
+    delete sprite_manager;
+    sprite_manager = NULL;
+  }
 
   /* Free mouse-cursor */
-  mouse_cursor->cursor.reset();
-  delete mouse_cursor;
+  if(mouse_cursor != NULL)
+  {
+    delete mouse_cursor;
+  }
 }
 
 /* EOF */