X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fresources.cpp;h=e1ac72fba4039f2df32bdc5fdd339b6a2fa48149;hb=86181b0a14d89cf45daf97199c3556c4dd1ee7b7;hp=d35e1a5cc3d3842ada6c4275d50a69447c84286e;hpb=ccab1476a8c4dba578db46dfb33f1a897c310d11;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index d35e1a5cc..e1ac72fba 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -16,87 +16,56 @@ // 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 "special/sprite_manager.h" -#include "app/setup.h" -#include "gui/menu.h" -#include "gui/button.h" -#include "scene.h" -#include "resources.h" -#include "tile_manager.h" -#include "object/gameobjs.h" -#include "object/player.h" - -Menu* main_menu = 0; -Menu* game_menu = 0; -Menu* options_menu = 0; -Menu* options_keys_menu = 0; -Menu* options_joystick_menu = 0; -Menu* highscore_menu = 0; -Menu* load_game_menu = 0; -Menu* save_game_menu = 0; -Menu* contrib_menu = 0; -Menu* contrib_subset_menu = 0; - -MusicRef herring_song; -MusicRef level_end_song; -MusicRef credits_song; +#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" SpriteManager* sprite_manager = 0; TileManager* tile_manager = 0; -char * soundfilenames[NUM_SOUNDS] = { - "/sounds/jump.wav", - "/sounds/bigjump.wav", - "/sounds/skid.wav", - "/sounds/coin.wav", - "/sounds/invincible.wav", - "/sounds/brick.wav", - "/sounds/hurt.wav", - "/sounds/squish.wav", - "/sounds/fall.wav", - "/sounds/ricochet.wav", - "/sounds/bump-upgrade.wav", - "/sounds/upgrade.wav", - "/sounds/grow.wav", - "/sounds/fire-flower.wav", - "/sounds/shoot.wav", - "/sounds/lifeup.wav", - "/sounds/stomp.wav", - "/sounds/kick.wav", - "/sounds/explosion.wav", - "/sounds/warp.wav", - "/sounds/fireworks.wav" - }; - +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 loadshared() +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(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; @@ -106,21 +75,18 @@ void loadshared() Button::info_font = white_small_text; - int i; - - sprite_manager = new SpriteManager( - get_resource_filename("/images/supertux.strf")); - tile_manager = new TileManager("/images/tilesets/supertux.stgt"); + 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, "%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(); @@ -151,25 +117,13 @@ void loadshared() load_object_gfx(); /* Tux life: */ - tux_life = new Surface(datadir + "/images/shared/tux-life.png", - true); - - /* Sound effects: */ - for (i = 0; i < NUM_SOUNDS; i++) - SoundManager::get()->add_sound(SoundManager::get - ()->load_sound(datadir + soundfilenames[i]),i); - - /* Herring song */ - herring_song = SoundManager::get - ()->load_music(datadir + "/music/salcon.mod"); - level_end_song = SoundManager::get - ()->load_music(datadir + "/music/leveldone.mod"); - credits_song = SoundManager::get - ()->load_music(datadir + "/music/credits.ogg"); + tux_life = new Surface("images/creatures/tux_small/tux-life.png"); + + player_status = new PlayerStatus(); } /* Free shared data: */ -void unloadshared(void) +void unload_shared() { /* Free global images: */ delete gold_text; @@ -178,7 +132,6 @@ void unloadshared(void) delete gray_text; delete white_small_text; delete white_big_text; - delete yellow_nums; free_object_gfx(); @@ -198,18 +151,15 @@ void unloadshared(void) sprite_manager = 0; delete tile_manager; tile_manager = 0; -} -std::string get_resource_filename(const std::string& resource) -{ - std::string filepath = st_dir + resource; - if(FileSystem::faccessible(filepath)) - return filepath; - - filepath = datadir + resource; - if(FileSystem::faccessible(filepath)) - return filepath; + /* Free GUI/menu images: */ + delete checkbox; + delete checkbox_checked; + delete back; + delete arrow_left; + delete arrow_right; - std::cerr << "Couldn't find resource: '" << resource << "'." << std::endl; - return ""; + /* Free mouse-cursor */ + delete mouse_cursor; } +