X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fresources.cpp;h=940b0a06bdff6dc892c765df360591c1d9cda39f;hb=f135ee3fa4a3e61f09da32c1b8e2145b655b247a;hp=95bf48dfb4f596ea8f8f0b1486d43e4cfb30d3f3;hpb=717f10b21efba0b9b3dcd844df219c652a18797a;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index 95bf48dfb..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 @@ -16,62 +17,46 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include -#include "app/globals.h" -#include "sprite/sprite_manager.h" -#include "app/setup.h" -#include "gui/menu.h" -#include "gui/button.h" -#include "resources.h" -#include "tile_manager.h" -#include "object/gameobjs.h" -#include "object/player.h" - -MusicRef herring_song; -MusicRef level_end_song; -MusicRef credits_song; - -SpriteManager* sprite_manager = 0; -TileManager* tile_manager = 0; -SoundManager* sound_manager = 0; - -Font* gold_text; -Font* blue_text; -Font* gray_text; -Font* yellow_nums; -Font* white_text; -Font* white_small_text; -Font* white_big_text; - +#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* 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() { - /* Load GUI/menu images: */ - checkbox = new Surface(datadir + "/images/status/checkbox.png", true); - checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", true); - back = new Surface(datadir + "/images/status/back.png", true); - arrow_left = new Surface(datadir + "/images/icons/left.png", true); - arrow_right = new Surface(datadir + "/images/icons/right.png", true); - /* Load the mouse-cursor */ - mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1); + mouse_cursor = new MouseCursor("images/engine/menu/mousecursor.png"); MouseCursor::set_current(mouse_cursor); /* Load global images: */ - gold_text = new Font(datadir + "/images/fonts/gold.png", Font::TEXT, 16,18); - blue_text = new Font(datadir + "/images/fonts/blue.png", Font::TEXT, 16,18,3); - white_text = new Font(datadir + "/images/fonts/white.png", - Font::TEXT, 16,18); - gray_text = new Font(datadir + "/images/fonts/gray.png", - Font::TEXT, 16,18); - white_small_text = new Font(datadir + "/images/fonts/white-small.png", - Font::TEXT, 8,9, 1); - white_big_text = new Font(datadir + "/images/fonts/white-big.png", - Font::TEXT, 20,22, 3); - yellow_nums = new Font(datadir + "/images/fonts/numbers.png", - Font::NUM, 32,32); + 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; @@ -81,78 +66,45 @@ void load_shared() Button::info_font = white_small_text; - sprite_manager = new SpriteManager( - get_resource_filename("/images/supertux.strf")); - tile_manager = new TileManager("/images/tilesets/supertux.stgt"); + 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, "%s/images/shared/tux-grow-left-%i.png", datadir.c_str(), i+1); - growingtux_left[i] = new Surface(img_name, true); + sprintf(img_name, "images/creatures/tux_grow/left-%i.png", i+1); + growingtux_left[i] = new Surface(img_name); - sprintf(img_name, "%s/images/shared/tux-grow-right-%i.png", datadir.c_str(), i+1); - growingtux_right[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); } 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->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("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"); + 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("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"); + 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("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(); - - /* Tux life: */ - tux_life = new Surface(datadir + "/images/shared/tux-life.png", - true); - - /* 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"); - - /* Herring song */ - herring_song = sound_manager->load_music(datadir + "/music/salcon.mod"); - level_end_song = sound_manager->load_music(datadir + "/music/leveldone.mod"); + 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"); + + player_status = new PlayerStatus(); } /* Free shared data: */ @@ -165,11 +117,6 @@ void unload_shared() 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; @@ -182,31 +129,11 @@ void unload_shared() } delete sprite_manager; - sprite_manager = 0; + sprite_manager = NULL; delete tile_manager; - tile_manager = 0; - - /* Free GUI/menu images: */ - delete checkbox; - delete checkbox_checked; - delete back; - delete arrow_left; - delete arrow_right; + tile_manager = NULL; /* Free mouse-cursor */ delete mouse_cursor; } -std::string get_resource_filename(const std::string& resource) -{ - std::string filepath = user_dir + "/" + resource; - if(FileSystem::faccessible(filepath)) - return filepath; - - filepath = datadir + resource; - if(FileSystem::faccessible(filepath)) - return filepath; - - std::cerr << "Couldn't find resource: '" << resource << "'." << std::endl; - return ""; -}