X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=940b0a06bdff6dc892c765df360591c1d9cda39f;hb=9a1687312904d32d5aa53851a24d643c7def02ff;hp=b5615782f3e07b6cdbc9119892e2a80a88f31481;hpb=f3e5e57c9996168a4889ae8e195be25f8b7e629b;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index b5615782f..940b0a06b 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -1,7 +1,8 @@ // $Id$ // -// SuperTux - A Jump'n Run +// SuperTux // Copyright (C) 2003 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -27,18 +28,15 @@ #include "object/gameobjs.hpp" #include "object/player.hpp" -SpriteManager* sprite_manager = 0; -TileManager* tile_manager = 0; +MouseCursor* mouse_cursor = NULL; -MouseCursor* mouse_cursor = 0; +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; -Font* gold_text; -Font* blue_text; -Font* gray_text; -Font* white_text; -Font* white_small_text; -Font* white_big_text; - /* Load graphics/sounds shared between all levels: */ void load_shared() { @@ -112,40 +110,28 @@ void load_shared() /* Free shared data: */ void unload_shared() { - printf("0\n"); - /* Free global images: */ delete gold_text; - printf("first\n"); delete white_text; delete blue_text; delete gray_text; delete white_small_text; - printf("last\n"); delete white_big_text; - printf("1\n"); - delete small_tux; delete big_tux; delete fire_tux; delete ice_tux; - printf("2\n"); - for (int i = 0; i < GROWING_FRAMES; i++) { delete growingtux_left[i]; delete growingtux_right[i]; } - printf("3\n"); - delete sprite_manager; - sprite_manager = 0; + sprite_manager = NULL; delete tile_manager; - tile_manager = 0; - - printf("4\n"); + tile_manager = NULL; /* Free mouse-cursor */ delete mouse_cursor;