X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fresources.cpp;h=4e6f6e1f1f84be9b15d3f90ccae59f2635a328a1;hb=d3be1cc7c63d3f8487a26050526802bb76b14e1c;hp=933185121f4275f4b5b52fdf736be46b74493e5e;hpb=a8efabdbbd82b92520c90272ea3a933ef7a27fba;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index 933185121..4e6f6e1f1 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 @@ -19,103 +20,37 @@ #include #include "sprite/sprite_manager.hpp" -#include "gui/menu.hpp" -#include "gui/button.hpp" #include "resources.hpp" #include "file_system.hpp" #include "tile_manager.hpp" #include "object/gameobjs.hpp" #include "object/player.hpp" +#include "gui/mousecursor.hpp" +#include "player_status.hpp" -SpriteManager* sprite_manager = 0; -TileManager* tile_manager = 0; +MouseCursor* mouse_cursor = NULL; -MouseCursor* mouse_cursor = 0; +Font* fixed_font = NULL; +Font* normal_font = NULL; +Font* small_font = NULL; +Font* big_font = 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() { - /* Load GUI/menu images: */ - checkbox = new Surface("images/engine/menu/checkbox-unchecked.png"); - checkbox_checked = new Surface("images/engine/menu/checkbox-checked.png"); - back = new Surface("images/engine/menu/arrow-back.png"); - arrow_left = new Surface("images/engine/menu/arrow-left.png"); - arrow_right = new Surface("images/engine/menu/arrow-right.png"); - /* Load the mouse-cursor */ mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png"); 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", - "images/engine/fonts/shadow.png", 16, 18); - gray_text = new Font("images/engine/fonts/gray.png", - "images/engine/fonts/shadow.png", 16, 18); - white_small_text = new Font("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", - "images/engine/fonts/shadow-big.png", 20, 22, 3); - - 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; - - Button::info_font = white_small_text; + fixed_font = new Font(Font::FIXED, "fonts/white.stf"); + normal_font = new Font(Font::VARIABLE, "fonts/white.stf"); + small_font = new Font(Font::VARIABLE, "fonts/white-small.stf", 1); + big_font = new Font(Font::VARIABLE, "fonts/white-big.stf", 3); + 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++) - { - sprintf(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); - 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"); - - /* Tux life: */ - tux_life = new Surface("images/creatures/tux_small/tux-life.png"); - player_status = new PlayerStatus(); } @@ -123,38 +58,16 @@ void load_shared() void unload_shared() { /* Free global images: */ - delete gold_text; - delete white_text; - delete blue_text; - delete gray_text; - delete white_small_text; - delete white_big_text; - - delete tux_life; - - 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 normal_font; + delete small_font; + delete big_font; delete sprite_manager; - sprite_manager = 0; - delete tile_manager; - tile_manager = 0; - - /* Free GUI/menu images: */ - delete checkbox; - delete checkbox_checked; - delete back; - delete arrow_left; - delete arrow_right; + sprite_manager = NULL; /* Free mouse-cursor */ delete mouse_cursor; -} + delete player_status; + player_status = NULL; +}