X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=3d1c391d80101bf1c686a9b1970906e53d8acb47;hb=157cef71aeb9ae25b7bb90f37dda11bc09329d11;hp=0651a9d5015bc251d5403483243b1f32571287f6;hpb=246341c4243afa18017a84ef221f3926e19c40be;p=supertux.git diff --git a/src/resources.cpp b/src/resources.cpp index 0651a9d50..3d1c391d8 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -34,8 +34,6 @@ Surface* img_poletop; Surface* img_flag[2]; Surface* img_cloud[2][4]; -Surface* img_red_glow; - MusicRef herring_song; MusicRef level_end_song; @@ -99,6 +97,22 @@ void loadshared() firetux.duck_left = sprite_manager->load("firetux-duck-left"); firetux.duck_right = sprite_manager->load("firetux-duck-right"); + 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"); + + /* Water: */ img_water = new Surface(datadir + "/images/shared/water.png", IGNORE_ALPHA); @@ -161,9 +175,8 @@ void loadshared() /* Upgrades: */ load_special_gfx(); - /* Weapons: */ - img_red_glow = new Surface(datadir + "/images/shared/red-glow.png", - USE_ALPHA); + /* Objects */ + load_object_gfx(); /* Distros: */ img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png", @@ -220,7 +233,6 @@ void unloadshared(void) for (i = 0; i < 2; i++) delete img_flag[i]; - delete img_red_glow; for (i = 0; i < 4; i++) { delete img_distro[i];