X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=5267f4b8ac1ec0382eaeec1651ae9c38cd842689;hb=6f801c22d97251799740317fb1d0caf2e744b321;hp=427a95017424c149a94b4e0b36c504515a7369e2;hpb=537e02ddc385e0ace2a8641847880ea5d328f604;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index 427a95017..5267f4b8a 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -17,18 +17,17 @@ // 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 "scene.h" -#include "player.h" -#include "badguy.h" -#include "gameobjs.h" -#include "special.h" -#include "resources.h" #include "special/sprite_manager.h" -#include "audio/sound_manager.h" #include "app/setup.h" -#include "door.h" +#include "gui/menu.h" #include "gui/button.h" +#include "scene.h" +#include "resources.h" +#include "object/gameobjs.h" +#include "object/player.h" Surface* img_waves[3]; Surface* img_water; @@ -53,7 +52,6 @@ MusicRef herring_song; MusicRef level_end_song; SpriteManager* sprite_manager = 0; -SoundManager* sound_manager = 0; char * soundfilenames[NUM_SOUNDS] = { "/sounds/jump.wav", @@ -74,7 +72,9 @@ char * soundfilenames[NUM_SOUNDS] = { "/sounds/lifeup.wav", "/sounds/stomp.wav", "/sounds/kick.wav", - "/sounds/explosion.wav" + "/sounds/explosion.wav", + "/sounds/warp.wav", + "/sounds/fireworks.wav" }; @@ -114,12 +114,12 @@ void loadshared() int i; - sprite_manager = new SpriteManager(datadir + "/supertux.strf"); + sprite_manager = new SpriteManager(datadir + "/images/supertux.strf"); /* Tuxes: */ - smalltux_star = sprite_manager->load("smalltux-star"); - largetux_star = sprite_manager->load("largetux-star"); - smalltux_gameover = sprite_manager->load("smalltux-gameover"); + 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++) @@ -131,68 +131,29 @@ void loadshared() growingtux_right[i] = new Surface(img_name, true); } - smalltux.stand_left = sprite_manager->load("smalltux-stand-left"); - smalltux.stand_right = sprite_manager->load("smalltux-stand-right"); - smalltux.walk_left = sprite_manager->load("smalltux-walk-left"); - smalltux.walk_right = sprite_manager->load("smalltux-walk-right"); - smalltux.jump_left = sprite_manager->load("smalltux-jump-left"); - smalltux.jump_right = sprite_manager->load("smalltux-jump-right"); - smalltux.kick_left = sprite_manager->load("smalltux-kick-left"); - smalltux.kick_right = sprite_manager->load("smalltux-kick-right"); - smalltux.skid_left = sprite_manager->load("smalltux-skid-left"); - smalltux.skid_right = sprite_manager->load("smalltux-skid-right"); - smalltux.grab_left = sprite_manager->load("smalltux-grab-left"); - smalltux.grab_right = sprite_manager->load("smalltux-grab-right"); - smalltux.stomp = sprite_manager->load("stomp"); - - largetux.stand_left = sprite_manager->load("largetux-stand-left"); - largetux.stand_right = sprite_manager->load("largetux-stand-right"); - largetux.walk_left = sprite_manager->load("largetux-walk-left"); - largetux.walk_right = sprite_manager->load("largetux-walk-right"); - largetux.jump_left = sprite_manager->load("largetux-jump-left"); - largetux.jump_right = sprite_manager->load("largetux-jump-right"); - largetux.kick_left = sprite_manager->load("largetux-kick-left"); - largetux.kick_right = sprite_manager->load("largetux-kick-right"); - largetux.skid_right = sprite_manager->load("largetux-skid-right"); - largetux.skid_left = sprite_manager->load("largetux-skid-left"); - largetux.grab_left = sprite_manager->load("largetux-grab-left"); - largetux.grab_right = sprite_manager->load("largetux-grab-right"); - largetux.duck_left = sprite_manager->load("largetux-duck-left"); - largetux.duck_right = sprite_manager->load("largetux-duck-right"); - largetux.stomp = sprite_manager->load("stomp"); - - firetux.stand_left = sprite_manager->load("firetux-stand-left"); - firetux.stand_right = sprite_manager->load("firetux-stand-right"); - firetux.walk_left = sprite_manager->load("firetux-walk-left"); - firetux.walk_right = sprite_manager->load("firetux-walk-right"); - firetux.jump_left = sprite_manager->load("firetux-jump-left"); - firetux.jump_right = sprite_manager->load("firetux-jump-right"); - firetux.kick_left = sprite_manager->load("firetux-kick-left"); - firetux.kick_right = sprite_manager->load("firetux-kick-right"); - firetux.skid_right = sprite_manager->load("firetux-skid-right"); - firetux.skid_left = sprite_manager->load("firetux-skid-left"); - firetux.grab_left = sprite_manager->load("firetux-grab-left"); - firetux.grab_right = sprite_manager->load("firetux-grab-right"); - firetux.duck_left = sprite_manager->load("firetux-duck-left"); - firetux.duck_right = sprite_manager->load("firetux-duck-right"); - firetux.stomp = sprite_manager->load("stomp"); - - icetux.stand_left = sprite_manager->load("icetux-stand-left"); - icetux.stand_right = sprite_manager->load("icetux-stand-right"); - icetux.walk_left = sprite_manager->load("icetux-walk-left"); - icetux.walk_right = sprite_manager->load("icetux-walk-right"); - icetux.jump_left = sprite_manager->load("icetux-jump-left"); - icetux.jump_right = sprite_manager->load("icetux-jump-right"); - icetux.kick_left = sprite_manager->load("icetux-kick-left"); - icetux.kick_right = sprite_manager->load("icetux-kick-right"); - icetux.skid_right = sprite_manager->load("icetux-skid-right"); - icetux.skid_left = sprite_manager->load("icetux-skid-left"); - icetux.grab_left = sprite_manager->load("icetux-grab-left"); - icetux.grab_right = sprite_manager->load("icetux-grab-right"); - icetux.duck_left = sprite_manager->load("icetux-duck-left"); - icetux.duck_right = sprite_manager->load("icetux-duck-right"); - icetux.stomp = sprite_manager->load("stomp"); - + 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"); + + 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"); /* Water: */ img_water = new Surface(datadir + "/images/shared/water.png", false); @@ -203,6 +164,7 @@ void loadshared() img_waves[1] = new Surface(datadir + "/images/shared/waves-1.png", true); + img_waves[2] = new Surface(datadir + "/images/shared/waves-2.png", true); @@ -249,24 +211,9 @@ void loadshared() img_cloud[1][3] = new Surface(datadir + "/images/shared/cloud-13.png", true); - - /* Bad guys: */ - load_badguy_gfx(); - - /* Upgrades: */ - load_special_gfx(); - /* Objects */ load_object_gfx(); - // load the door object graphics: - door = sprite_manager->load("door"); - for (int i = 0; i < DOOR_OPENING_FRAMES; i++) - { - sprintf(img_name, "%s/images/shared/door-%i.png", datadir.c_str(), i+1); - door_opening[i] = new Surface(img_name, true); - } - /* Distros: */ img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png", true); @@ -302,7 +249,7 @@ void loadshared() /* Herring song */ herring_song = SoundManager::get - ()->load_music(datadir + "/music/SALCON.MOD"); + ()->load_music(datadir + "/music/salcon.mod"); level_end_song = SoundManager::get ()->load_music(datadir + "/music/leveldone.mod"); } @@ -310,6 +257,10 @@ void loadshared() /* Free shared data: */ void unloadshared(void) { + delete smalltux_star; + delete bigtux_star; + delete smalltux_gameover; + /* Free global images: */ delete gold_text; delete white_text; @@ -319,44 +270,50 @@ void unloadshared(void) delete white_big_text; delete yellow_nums; - int i; - - free_special_gfx(); - free_badguy_gfx(); + free_object_gfx(); delete img_water; - for (i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) delete img_waves[i]; delete img_pole; delete img_poletop; - for (i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) delete img_flag[i]; - for (i = 0; i < 4; i++) - { - delete img_distro[i]; - delete img_cloud[0][i]; - delete img_cloud[1][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; - for (int i = 0; i < GROWING_FRAMES; i++) - { + 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]; } - // door game object: - - for (int i = 0; i < DOOR_OPENING_FRAMES; i++) - delete door_opening[i]; - delete sprite_manager; sprite_manager = 0; - sound_manager = 0; } -/* EOF */ +std::string get_resource_filename(const std::string& resource) +{ + std::string filepath = st_dir + resource; + if(access(filepath.c_str(), R_OK) == 0) + return filepath; + + filepath = datadir + resource; + if(access(filepath.c_str(), R_OK) == 0) + return filepath; + + std::cerr << "Couldn't find resource: '" << resource << "'." << std::endl; + return ""; +}