[Super-tux-commit] supertux/src resources.cpp,1.61,1.62 resources.h,1.19,1.20 sector.cpp,1.59,1.60
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src resources.cpp,1.61,1.62 resources.h,1.19,1.20 sector.cpp,1.59,1.60
|
From: Matze B. <mat...@us...> - 2004-12-19 13:34:26
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22644/src Modified Files: resources.cpp resources.h sector.cpp Log Message: -german translation updates -some cleanups -a first version of grab&carry around code. It doesn't work too good yet but it was lying around too long on my HD... Index: resources.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- resources.h 28 Nov 2004 14:56:49 -0000 1.19 +++ resources.h 19 Dec 2004 13:34:11 -0000 1.20 @@ -62,13 +62,6 @@ extern char* soundfilenames[NUM_SOUNDS]; -extern Surface* img_waves[3]; -extern Surface* img_water; -extern Surface* img_pole; -extern Surface* img_poletop; -extern Surface* img_flag[2]; -extern Surface* img_cloud[2][4]; - extern Surface* img_super_bkgd; extern MusicRef herring_song; @@ -96,12 +89,14 @@ extern Font* white_big_text; extern Font* yellow_nums; -// maps a virtual resource path to a real path (ie. levels/bla is mapped to -// $DATADIR/levels/bla or $HOME/.supertux/levels/bla) +/** maps a virtual resource path to a real path (ie. levels/bla is mapped to + * $DATADIR/levels/bla or $HOME/.supertux/levels/bla) + * All paths inside the game should be handled in as virtual paths and then + * expanded with this function just before the call to fopen or std::ifstream. + */ std::string get_resource_filename(const std::string& resource); void loadshared(); void unloadshared(); #endif - Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- sector.cpp 5 Dec 2004 16:57:13 -0000 1.59 +++ sector.cpp 19 Dec 2004 13:34:11 -0000 1.60 @@ -52,6 +52,7 @@ #include "object/invisible_block.h" #include "object/platform.h" #include "object/bullet.h" +#include "object/rock.h" #include "badguy/jumpy.h" #include "badguy/snowball.h" #include "badguy/bouncing_snowball.h" @@ -149,6 +150,8 @@ return new Spiky(reader); } else if(name == "nolok_01") { return new Nolok_01(reader); + } else if(name == "rock") { + return new Rock(reader); } std::cerr << "Unknown object type '" << name << "'.\n"; Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- resources.cpp 6 Dec 2004 17:47:40 -0000 1.61 +++ resources.cpp 19 Dec 2004 13:34:11 -0000 1.62 @@ -30,14 +30,6 @@ #include "object/gameobjs.h" #include "object/player.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; @@ -91,7 +83,6 @@ /* Load graphics/sounds shared between all levels: */ void loadshared() { - /* 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); @@ -121,10 +112,6 @@ tile_manager = new TileManager("/images/tilesets/supertux.stgt"); /* 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++) { @@ -159,96 +146,17 @@ 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(datadir + "/images/shared/tux-life.png", true); /* 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: neo...@us..., if you have another opinion. :) - */ for (i = 0; i < NUM_SOUNDS; i++) - SoundManager::get - ()->add_sound(SoundManager::get + SoundManager::get()->add_sound(SoundManager::get ()->load_sound(datadir + soundfilenames[i]),i); /* Herring song */ @@ -261,10 +169,6 @@ /* Free shared data: */ void unloadshared(void) { - delete smalltux_star; - delete bigtux_star; - delete smalltux_gameover; - /* Free global images: */ delete gold_text; delete white_text; @@ -276,22 +180,6 @@ 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; |
