X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fresources.cpp;h=39cb26f20318590a3335d39b3c88db97252da06d;hb=0540d5db4c57c585615a78ccf33603ff3628db95;hp=6dbe55d194816552fc8fdcb71df761190529b3b8;hpb=fcae2511a70217bb8ca6e7fb13e0dab639a062f1;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index 6dbe55d19..39cb26f20 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -16,67 +16,21 @@ // 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 "player.h" -#include "gameobjs.h" -#include "resources.h" - -Surface* img_waves[3]; -Surface* img_water; -Surface* img_pole; -Surface* img_poletop; -Surface* img_flag[2]; -Surface* img_cloud[2][4]; -Surface* img_distro[4]; - -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; +#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; @@ -87,22 +41,29 @@ 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", 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(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", + 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(datadir + "/images/fonts/white-big.png", + white_big_text = new Font("images/engine/fonts/white-big.png", Font::TEXT, 20,22, 3); - yellow_nums = new Font(datadir + "/images/fonts/numbers.png", - Font::NUM, 32,32); + yellow_nums = new Font("images/engine/fonts/numbers.png", Font::NUM, 32,32); Menu::default_font = white_text; Menu::active_font = blue_text; @@ -112,22 +73,17 @@ void loadshared() Button::info_font = white_small_text; - int i; - - sprite_manager = new SpriteManager(datadir + "/images/supertux.strf"); + sprite_manager = new SpriteManager("images/sprites.strf"); + tile_manager = new TileManager("images/tiles.strf"); /* Tuxes: */ - smalltux_star = sprite_manager->create("smalltux-star"); - bigtux_star = sprite_manager->create("bigtux-star"); - smalltux_gameover = sprite_manager->create("smalltux-gameover"); - 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); + sprintf(img_name, "images/creatures/tux_grow/left-%i.png", i+1); growingtux_left[i] = new Surface(img_name, true); - sprintf(img_name, "%s/images/shared/tux-grow-right-%i.png", datadir.c_str(), i+1); + sprintf(img_name, "images/creatures/tux_grow/right-%i.png", i+1); growingtux_right[i] = new Surface(img_name, true); } @@ -155,112 +111,41 @@ void loadshared() ice_tux->arms = sprite_manager->create("big-tux-arms"); ice_tux->feet = sprite_manager->create("big-tux-feet"); - /* Water: */ - img_water = new Surface(datadir + "/images/shared/water.png", false); - - img_waves[0] = new Surface(datadir + "/images/shared/waves-0.png", - true); - - img_waves[1] = new Surface(datadir + "/images/shared/waves-1.png", - true); - - - img_waves[2] = new Surface(datadir + "/images/shared/waves-2.png", - true); - - - /* Pole: */ - - img_pole = new Surface(datadir + "/images/shared/pole.png", true); - img_poletop = new Surface(datadir + "/images/shared/poletop.png", - true); - - - /* Flag: */ - - img_flag[0] = new Surface(datadir + "/images/shared/flag-0.png", - true); - img_flag[1] = new Surface(datadir + "/images/shared/flag-1.png", - true); - - - /* Cloud: */ - - img_cloud[0][0] = new Surface(datadir + "/images/shared/cloud-00.png", - true); - - img_cloud[0][1] = new Surface(datadir + "/images/shared/cloud-01.png", - true); - - img_cloud[0][2] = new Surface(datadir + "/images/shared/cloud-02.png", - true); - - img_cloud[0][3] = new Surface(datadir + "/images/shared/cloud-03.png", - true); - - - img_cloud[1][0] = new Surface(datadir + "/images/shared/cloud-10.png", - true); - - img_cloud[1][1] = new Surface(datadir + "/images/shared/cloud-11.png", - true); - - img_cloud[1][2] = new Surface(datadir + "/images/shared/cloud-12.png", - true); - - img_cloud[1][3] = new Surface(datadir + "/images/shared/cloud-13.png", - true); - /* Objects */ load_object_gfx(); - /* Distros: */ - img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png", - true); - - img_distro[1] = new Surface(datadir + "/images/tilesets/coin2.png", - true); - - img_distro[2] = new Surface(datadir + "/images/tilesets/coin3.png", - true); - - img_distro[3] = new Surface(datadir + "/images/tilesets/coin2.png", - true); - - /* Tux life: */ + tux_life = new Surface("images/creatures/tux_small/tux-life.png", true); - tux_life = new Surface(datadir + "/images/shared/tux-life.png", - true); - +#if 0 /* Sound effects: */ - - /* if (use_sound) // this will introduce SERIOUS bugs here ! because "load_sound" - // initialize sounds[i] with the correct pointer's value: - // NULL or something else. And it will be dangerous to - // play with not-initialized pointers. - // This is also true with if (use_music) - Send a mail to me: neoneurone@users.sf.net, if you have another opinion. :) - */ - 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"); + 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 } /* Free shared data: */ -void unloadshared(void) +void unload_shared() { - delete smalltux_star; - delete bigtux_star; - delete smalltux_gameover; - /* Free global images: */ delete gold_text; delete white_text; @@ -272,22 +157,6 @@ void unloadshared(void) free_object_gfx(); - delete img_water; - for (int i = 0; i < 3; i++) - delete img_waves[i]; - - delete img_pole; - delete img_poletop; - - for (int i = 0; i < 2; i++) - delete img_flag[i]; - - for (int i = 0; i < 4; i++) { - delete img_distro[i]; - delete img_cloud[0][i]; - delete img_cloud[1][i]; - } - delete tux_life; delete small_tux; @@ -302,5 +171,17 @@ void unloadshared(void) 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; + + /* Free mouse-cursor */ + delete mouse_cursor; }