X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=a533ab7ba9626e43402a525c92b893f78fe4ef2a;hb=cf66e7ab073b4e9479d5b6d479f8c351b89e8aee;hp=f2c3c0a17b156f3f06e6f34b1295c5f8d37c267f;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index f2c3c0a17..a533ab7ba 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -16,29 +16,19 @@ // 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 "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" -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; +std::string datadir; +std::string user_dir; MusicRef herring_song; MusicRef level_end_song; @@ -46,31 +36,9 @@ MusicRef credits_song; SpriteManager* sprite_manager = 0; TileManager* tile_manager = 0; +SoundManager* sound_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; @@ -81,20 +49,31 @@ 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(datadir + "/images/engine/menu/checkbox-unchecked.png", true); + checkbox_checked = new Surface(datadir + "/images/engine/menu/checkbox-checked.png", true); + back = new Surface(datadir + "/images/engine/menu/arrow-back.png", true); + arrow_left = new Surface(datadir + "/images/engine/menu/arrow-left.png", true); + arrow_right = new Surface(datadir + "/images/engine/menu/arrow-right.png", true); + + /* Load the mouse-cursor */ + mouse_cursor = new MouseCursor(datadir + "/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", + gold_text = new Font(datadir + "/images/engine/fonts/gold.png", Font::TEXT, 16,18); + blue_text = new Font(datadir + "/images/engine/fonts/blue.png", Font::TEXT, 16,18,3); + white_text = new Font(datadir + "/images/engine/fonts/white.png", Font::TEXT, 16,18); - gray_text = new Font(datadir + "/images/fonts/gray.png", + gray_text = new Font(datadir + "/images/engine/fonts/gray.png", Font::TEXT, 16,18); - white_small_text = new Font(datadir + "/images/fonts/white-small.png", + white_small_text = new Font(datadir + "/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(datadir + "/images/engine/fonts/white-big.png", Font::TEXT, 20,22, 3); - yellow_nums = new Font(datadir + "/images/fonts/numbers.png", + yellow_nums = new Font(datadir + "/images/engine/fonts/numbers.png", Font::NUM, 32,32); Menu::default_font = white_text; @@ -105,20 +84,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"); + get_resource_filename("/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); + sprintf(img_name, "%s/images/creatures/tux_grow/left-%i.png", datadir.c_str(), 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, "%s/images/creatures/tux_grow/right-%i.png", datadir.c_str(), i+1); growingtux_right[i] = new Surface(img_name, true); } @@ -150,23 +127,39 @@ void loadshared() load_object_gfx(); /* Tux life: */ - tux_life = new Surface(datadir + "/images/shared/tux-life.png", + tux_life = new Surface(datadir + "/images/creatures/tux_small/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); + 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 = SoundManager::get - ()->load_music(datadir + "/music/salcon.mod"); - level_end_song = SoundManager::get - ()->load_music(datadir + "/music/leveldone.mod"); + herring_song = sound_manager->load_music(datadir + "/music/salcon.mod"); + level_end_song = sound_manager->load_music(datadir + "/music/leveldone.mod"); } /* Free shared data: */ -void unloadshared(void) +void unload_shared() { /* Free global images: */ delete gold_text; @@ -195,11 +188,21 @@ void unloadshared(void) 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; } std::string get_resource_filename(const std::string& resource) { - std::string filepath = st_dir + resource; + std::string filepath = user_dir + "/" + resource; if(FileSystem::faccessible(filepath)) return filepath;