X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=04bc5725a8072c0f7f57bb6007a62b86ef746cce;hb=472d0ad804844d28811c86f03da74b6d6be53f1b;hp=1f338a1cbddfb9eb8d3575d5afefc887d916e8db;hpb=795f0b283fcb1c8777723dc1cc850826d39c6806;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index 1f338a1cb..04bc5725a 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 @@ -18,130 +19,67 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "sprite/sprite_manager.h" -#include "gui/menu.h" -#include "gui/button.h" -#include "resources.h" -#include "file_system.h" -#include "tile_manager.h" -#include "object/gameobjs.h" -#include "object/player.h" +#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" + +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; -SpriteManager* sprite_manager = 0; -TileManager* tile_manager = 0; -SoundManager* sound_manager = 0; - -MouseCursor* mouse_cursor = 0; - -Font* gold_text; -Font* blue_text; -Font* gray_text; -Font* yellow_nums; -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", true); - checkbox_checked = new Surface("images/engine/menu/checkbox-checked.png", true); - back = new Surface("images/engine/menu/arrow-back.png", true); - arrow_left = new Surface("images/engine/menu/arrow-left.png", true); - arrow_right = new Surface("images/engine/menu/arrow-right.png", true); - /* 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", Font::TEXT, 16,18); - blue_text = new Font("images/engine/fonts/blue.png", Font::TEXT, 16,18,3); - white_text = new Font("images/engine/fonts/white.png", Font::TEXT, 16,18); - gray_text = new Font("images/engine/fonts/gray.png", Font::TEXT, 16,18); - white_small_text = new Font("images/engine/fonts/white-small.png", - Font::TEXT, 8,9, 1); - white_big_text = new Font("images/engine/fonts/white-big.png", - Font::TEXT, 20,22, 3); - yellow_nums = new Font("images/engine/fonts/numbers.png", Font::NUM, 32,32); - - Menu::default_font = white_text; - Menu::active_font = blue_text; + 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); + 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(Font::VARIABLE, + "images/engine/fonts/white-small.png", + "images/engine/fonts/shadow-small.png", 8, 9, 1); + 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::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("images/sprites.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); - growingtux_left[i] = new Surface(img_name, true); - - sprintf(img_name, "images/creatures/tux_grow/right-%i.png", i+1); - growingtux_right[i] = new Surface(img_name, true); - } - - small_tux = new TuxBodyParts(); - small_tux->head = 0; - small_tux->body = sprite_manager->create("small-tux-body"); - small_tux->arms = sprite_manager->create("small-tux-arms"); - small_tux->feet = 0; - - big_tux = new TuxBodyParts(); - big_tux->head = sprite_manager->create("big-tux-head"); - big_tux->body = sprite_manager->create("big-tux-body"); - big_tux->arms = sprite_manager->create("big-tux-arms"); - big_tux->feet = sprite_manager->create("big-tux-feet"); + Menu::label_font = white_big_text; + Menu::field_font = gold_text; - fire_tux = new TuxBodyParts(); - fire_tux->head = sprite_manager->create("big-fire-tux-head"); - fire_tux->body = sprite_manager->create("big-tux-body"); - fire_tux->arms = sprite_manager->create("big-tux-arms"); - fire_tux->feet = sprite_manager->create("big-tux-feet"); - - ice_tux = new TuxBodyParts(); - ice_tux->head = sprite_manager->create("big-tux-head"); - ice_tux->body = sprite_manager->create("big-tux-body"); - ice_tux->arms = sprite_manager->create("big-tux-arms"); - ice_tux->feet = sprite_manager->create("big-tux-feet"); - - /* Objects */ - load_object_gfx(); + Button::info_font = white_small_text; - /* Tux life: */ - tux_life = new Surface("images/creatures/tux_small/tux-life.png", true); + tile_manager = new TileManager(); + sprite_manager = new SpriteManager(); -#if 0 - /* Sound effects: */ - sound_manager->preload_sound("jump"); - sound_manager->preload_sound("bigjump"); - sound_manager->preload_sound("skid"); - sound_manager->preload_sound("coin"); - sound_manager->preload_sound("invincible"); - sound_manager->preload_sound("brick"); - sound_manager->preload_sound("hurt"); - sound_manager->preload_sound("squish"); - sound_manager->preload_sound("fall"); - sound_manager->preload_sound("ricochet"); - sound_manager->preload_sound("bump-upgrade"); - sound_manager->preload_sound("upgrade"); - sound_manager->preload_sound("grow"); - sound_manager->preload_sound("fire-flower"); - sound_manager->preload_sound("shoot"); - sound_manager->preload_sound("lifeup"); - sound_manager->preload_sound("stomp"); - sound_manager->preload_sound("kick"); - sound_manager->preload_sound("explosion"); - sound_manager->preload_sound("warp"); - sound_manager->preload_sound("fireworks"); -#endif + player_status = new PlayerStatus(); } /* Free shared data: */ @@ -149,40 +87,19 @@ void unload_shared() { /* Free global images: */ delete gold_text; + delete gold_fixed_text; delete white_text; delete blue_text; delete gray_text; delete white_small_text; delete white_big_text; - delete yellow_nums; - - free_object_gfx(); - - 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 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; +}