super-tux-commit Mailing List for Super Tux (Page 87)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Ingo R. <gr...@us...> - 2004-04-26 10:46:55
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10768 Modified Files: world.cpp world.h worldmap.cpp Log Message: - added bonus loading Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- world.h 22 Apr 2004 19:15:22 -0000 1.30 +++ world.h 26 Apr 2004 10:46:45 -0000 1.31 @@ -111,6 +111,10 @@ /** Try to bumb a badguy that might we walking above Tux, thus shaking the tile which the badguy is walking on an killing him this way */ void trybumpbadguy(float x, float y); + + /** Apply bonuses active in the player status, used to reactivate + bonuses from former levels */ + void apply_bonuses(); }; /** FIMXE: Workaround for the leveleditor mainly */ Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- worldmap.cpp 26 Apr 2004 10:03:34 -0000 1.50 +++ worldmap.cpp 26 Apr 2004 10:46:45 -0000 1.51 @@ -615,6 +615,7 @@ break; case GameSession::GAME_OVER: quit = true; + player_status.bonus = PlayerStatus::NO_BONUS; break; case GameSession::NONE: // Should never be reached @@ -863,12 +864,15 @@ { Point p; std::string back_str = "none"; + std::string bonus_str = "none"; LispReader tux_reader(tux_cur); tux_reader.read_int("x", &p.x); tux_reader.read_int("y", &p.y); tux_reader.read_string("back", &back_str); + tux_reader.read_string("bonus", &bonus_str); + player_status.bonus = string_to_bonus(bonus_str); tux->back_direction = string_to_direction(back_str); tux->set_tile_pos(p); } Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- world.cpp 24 Apr 2004 14:49:04 -0000 1.40 +++ world.cpp 26 Apr 2004 10:46:42 -0000 1.41 @@ -52,6 +52,8 @@ activate_bad_guys(); activate_particle_systems(); get_level()->load_song(); + + apply_bonuses(); } World::World(const std::string& subset, int level_nr) @@ -69,6 +71,32 @@ activate_bad_guys(); activate_particle_systems(); get_level()->load_song(); + + apply_bonuses(); +} + +void +World::apply_bonuses() +{ + std::cout << "Bonus: " << player_status.bonus << std::endl; + + // Apply bonuses from former levels + switch (player_status.bonus) + { + case PlayerStatus::NO_BONUS: + break; + + case PlayerStatus::FLOWER_BONUS: + tux.got_coffee = true; + // fall through + + case PlayerStatus::GROWUP_BONUS: + // FIXME: Move this to Player class + tux.size = BIG; + tux.base.height = 64; + tux.base.y -= 32; + break; + } } World::~World() |
|
From: Ingo R. <gr...@us...> - 2004-04-26 10:03:46
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2607 Modified Files: gameloop.cpp player.cpp scene.cpp scene.h worldmap.cpp Log Message: - added saving of bonuses on worldmap, no loading yet Index: scene.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- scene.cpp 22 Apr 2004 20:41:40 -0000 1.24 +++ scene.cpp 26 Apr 2004 10:03:34 -0000 1.25 @@ -27,8 +27,34 @@ : score(0), distros(0), lives(START_LIVES), - score_multiplier(1) + score_multiplier(1), + bonus(NO_BONUS) +{ +} + +std::string bonus_to_string(PlayerStatus::BonusType b) +{ + switch (b) + { + case PlayerStatus::NO_BONUS: + return "none"; + case PlayerStatus::GROWUP_BONUS: + return "growup"; + case PlayerStatus::FLOWER_BONUS: + return "icflower"; + } +} + +PlayerStatus::BonusType string_to_bonus(const std::string& str) { + if (str == "none") + return PlayerStatus::NO_BONUS; + else if (str == "growup") + return PlayerStatus::GROWUP_BONUS; + else if (str == "iceflower") + return PlayerStatus::FLOWER_BONUS; + else + return PlayerStatus::NO_BONUS; } // FIXME: Move this into a view class Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- player.cpp 25 Apr 2004 22:10:30 -0000 1.65 +++ player.cpp 26 Apr 2004 10:03:34 -0000 1.66 @@ -440,7 +440,7 @@ } /* Duck! */ - if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0) + if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0 && on_ground()) { duck = true; base.height = 32; Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- worldmap.cpp 25 Apr 2004 21:55:39 -0000 1.49 +++ worldmap.cpp 26 Apr 2004 10:03:34 -0000 1.50 @@ -597,6 +597,12 @@ { case GameSession::LEVEL_FINISHED: level->solved = true; + if (session.get_world()->get_tux()->got_coffee) + player_status.bonus = PlayerStatus::FLOWER_BONUS; + else if (session.get_world()->get_tux()->size == BIG) + player_status.bonus = PlayerStatus::GROWUP_BONUS; + else + player_status.bonus = PlayerStatus::NO_BONUS; break; case GameSession::LEVEL_ABORT: // Reseting the player_status might be a worthy @@ -809,8 +815,9 @@ << " (lives " << player_status.lives << ")\n" << " (score " << player_status.score << ")\n" << " (distros " << player_status.distros << ")\n" - << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")" - << " (back \"" << direction_to_string(tux->back_direction) << "\"))\n" + << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")\n" + << " (back \"" << direction_to_string(tux->back_direction) << "\")\n" + << " (bonus \"" << bonus_to_string(player_status.bonus) << "\"))\n" << " (levels\n"; for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) Index: scene.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- scene.h 20 Apr 2004 11:09:34 -0000 1.26 +++ scene.h 26 Apr 2004 10:03:34 -0000 1.27 @@ -31,12 +31,17 @@ int score; int distros; int lives; + enum BonusType { NO_BONUS, GROWUP_BONUS, FLOWER_BONUS }; + BonusType bonus; int score_multiplier; PlayerStatus(); }; +std::string bonus_to_string(PlayerStatus::BonusType b); +PlayerStatus::BonusType string_to_bonus(const std::string& str); + extern PlayerStatus player_status; extern float scroll_x; Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- gameloop.cpp 25 Apr 2004 23:46:29 -0000 1.103 +++ gameloop.cpp 26 Apr 2004 10:03:33 -0000 1.104 @@ -599,9 +599,6 @@ } } - delete world; - world = 0; - return exit_status; } |
|
From: Ingo R. <gr...@us...> - 2004-04-25 23:58:53
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29504/data/levels/test Modified Files: level3.stl Log Message: - endseq stuff Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level3.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- level3.stl 23 Apr 2004 16:30:09 -0000 1.1 +++ level3.stl 25 Apr 2004 23:58:44 -0000 1.2 @@ -20,54 +20,54 @@ (particle_system "") (theme "antarctica") (interactive-tm - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 126 0 112 112 112 112 112 112 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 112 112 0 0 0 0 112 112 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 112 112 112 0 0 0 0 0 112 112 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 112 112 112 112 0 0 0 0 0 0 112 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 - 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 48 8 8 8 0 0 0 0 8 8 8 8 8 112 8 8 8 8 8 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 112 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 112 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 + 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0 8 8 8 8 8 112 8 8 8 8 8 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ) (background-tm - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 8 0 8 8 0 8 0 8 8 0 8 0 8 8 0 8 0 8 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 81 80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 9 0 0 0 0 0 0 0 0 7 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - ) - - (foreground-tm + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 48 48 48 48 48 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 130 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0 0 0 0 0 0 0 0 0 0 0 + ) + + (foreground-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 130 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
From: Ingo R. <gr...@us...> - 2004-04-25 23:46:41
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26481 Modified Files: gameloop.cpp gameloop.h level.cpp special.cpp special.h Log Message: - tweaked bullet and endsequence Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- gameloop.h 21 Apr 2004 13:41:01 -0000 1.45 +++ gameloop.h 25 Apr 2004 23:46:30 -0000 1.46 @@ -58,7 +58,7 @@ /** If true the end_sequence will be played, user input will be ignored while doing that */ - bool end_sequenze; + bool end_sequence; float last_x_pos; bool game_pause; Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- level.cpp 25 Apr 2004 21:55:39 -0000 1.51 +++ level.cpp 25 Apr 2004 23:46:30 -0000 1.52 @@ -499,7 +499,7 @@ // FIXME: -10 is a rather random value, we still need some kind of // real levelend gola if (use_endsequence) - endpos = 32*(width-20); + endpos = 32*(width-30); else endpos = 32*(width-15); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- gameloop.cpp 25 Apr 2004 13:51:19 -0000 1.102 +++ gameloop.cpp 25 Apr 2004 23:46:29 -0000 1.103 @@ -58,7 +58,7 @@ GameSession* GameSession::current_ = 0; GameSession::GameSession(const std::string& subset_, int levelnb_, int mode) - : world(0), st_gl_mode(mode), levelnb(levelnb_), end_sequenze(false), + : world(0), st_gl_mode(mode), levelnb(levelnb_), end_sequence(false), subset(subset_) { current_ = this; @@ -77,7 +77,7 @@ { game_pause = false; exit_status = NONE; - end_sequenze = false; + end_sequence = false; fps_timer.init(true); frame_timer.init(true); @@ -195,7 +195,7 @@ void GameSession::process_events() { - if (end_sequenze) + if (end_sequence) { Player& tux = *world->get_tux(); @@ -378,13 +378,13 @@ Player* tux = world->get_tux(); /* End of level? */ - if (tux->base.x >= World::current()->get_level()->endpos + 320) + if (tux->base.x >= World::current()->get_level()->endpos + 32 * (get_level()->use_endsequence ? 22 : 10)) { exit_status = LEVEL_FINISHED; } - else if (tux->base.x >= World::current()->get_level()->endpos && !end_sequenze) + else if (tux->base.x >= World::current()->get_level()->endpos && !end_sequence) { - end_sequenze = true; + end_sequence = true; last_x_pos = -1; music_manager->halt_music(); } @@ -528,7 +528,7 @@ while (frame_ratio > 0) { // Update the world - if (end_sequenze) + if (end_sequence) action(.5f); else action(1.0f); Index: special.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- special.h 25 Apr 2004 21:55:39 -0000 1.17 +++ special.h 25 Apr 2004 23:46:30 -0000 1.18 @@ -65,6 +65,7 @@ class Bullet { public: + int life_count; base_type base; base_type old_base; Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- special.cpp 25 Apr 2004 22:10:32 -0000 1.28 +++ special.cpp 25 Apr 2004 23:46:30 -0000 1.29 @@ -45,6 +45,7 @@ void Bullet::init(float x, float y, float xm, Direction dir) { + life_count = 3; base.width = 4; base.height = 4; @@ -99,6 +100,7 @@ base.ym = 9; else if (base.ym < -9) base.ym = -9; + life_count -= 1; } base.ym = base.ym + 0.5 * frame_ratio; @@ -108,7 +110,8 @@ base.y < 0 || base.y > screen->h || issolid(base.x + 4, base.y + 2) || - issolid(base.x, base.y + 2)) + issolid(base.x, base.y + 2) || + life_count <= 0) { remove_me(); } |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:46:10
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14233 Modified Files: supertux.stgt Added Files: goal1-1.png goal1-2.png goal1-3.png goal1-4.png goal1-5.png goal2-1.png goal2-2.png goal2-3.png goal2-4.png goal2-5.png Log Message: - added goal tiles --- NEW FILE: goal2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal2-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal1-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: goal1-2.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- supertux.stgt 25 Apr 2004 11:57:19 -0000 1.18 +++ supertux.stgt 25 Apr 2004 22:46:01 -0000 1.19 @@ -424,5 +424,38 @@ (fullbox #t) (data 4) (next-tile 84)) + + (tile (id 129) + (anim-speed 50) + (images "goal1-1.png" + "goal1-2.png" + "goal1-2.png" + "goal1-3.png" + "goal1-4.png" + "goal1-5.png" + "goal1-4.png" + "goal1-3.png" + "goal1-2.png" + "goal1-2.png" + "goal1-1.png" + "goal1-1.png" + )) + + (tile (id 130) + (anim-speed 50) + (images "goal2-1.png" + "goal2-2.png" + "goal2-2.png" + "goal2-3.png" + "goal2-4.png" + "goal2-5.png" + "goal2-4.png" + "goal2-3.png" + "goal2-2.png" + "goal2-2.png" + "goal2-1.png" + "goal2-1.png")) + + ) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:24:52
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9371/data Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 25 Apr 2004 22:23:18 -0000 1.8 +++ Makefile.am 25 Apr 2004 22:24:44 -0000 1.9 @@ -22,9 +22,9 @@ $(wildcard images/title/*.jpg) \ $(wildcard images/tilesets/*.png) \ $(wildcard images/tilesets/*.stgt) \ - levels/default/worldmap.stwm \ - $(wildcard levels/misc/*.stl) \ $(wildcard levels/*/*.stl) \ + $(wildcard levels/*/*.stwm) \ + $(wildcard levels/*/info) \ $(wildcard music/*.mod) \ $(wildcard music/*.MOD) \ $(wildcard sounds/*.wav) \ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:23:30
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9084 Modified Files: configure.ac Log Message: Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure.ac 25 Apr 2004 18:38:49 -0000 1.18 +++ configure.ac 25 Apr 2004 22:23:17 -0000 1.19 @@ -44,7 +44,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes") if test "x${enable_debug}" != "xno"; then - CXXFLAGS="$CXXFLAGS -Wall -W -DDEBUG" + CXXFLAGS="$CXXFLAGS -Wall -W -DDEBUG -O0 -g3" AC_MSG_RESULT([enabled]) else AC_MSG_RESULT([disabled]) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:23:30
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9084/data Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 25 Apr 2004 18:37:25 -0000 1.7 +++ Makefile.am 25 Apr 2004 22:23:18 -0000 1.8 @@ -4,7 +4,9 @@ images/icon.png \ images/icon.xpm \ $(wildcard images/*.png) \ + $(wildcard images/*.xpm) \ $(wildcard images/background/*.png) \ + $(wildcard images/background/*.jpg) \ $(wildcard images/highscore/*.png) \ $(wildcard images/icons/*.png) \ $(wildcard images/icons/*.xpm) \ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:13:47
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6804 Modified Files: CREDITS Log Message: - moved heading/version info into code Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- CREDITS 19 Apr 2004 14:28:49 -0000 1.7 +++ CREDITS 25 Apr 2004 22:13:36 -0000 1.8 @@ -1,9 +1,3 @@ -CREDITS for Super Tux - - Version 0.0.6 - March 15, 2004 - - Developers ---------- |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:10:52
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6212 Modified Files: player.cpp special.cpp Log Message: - bullet tweaks Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- player.cpp 25 Apr 2004 16:46:55 -0000 1.64 +++ player.cpp 25 Apr 2004 22:10:30 -0000 1.65 @@ -121,6 +121,8 @@ } else if(key == keymap.fire) { + if (state == UP) + input.old_fire = UP; input.fire = state; return true; } @@ -412,6 +414,7 @@ if (input.fire == DOWN && input.old_fire == UP && got_coffee) { World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir); + input.old_fire = DOWN; } /* tux animations: */ Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- special.cpp 25 Apr 2004 21:55:39 -0000 1.27 +++ special.cpp 25 Apr 2004 22:10:32 -0000 1.28 @@ -95,10 +95,10 @@ { base.y = old_y; base.ym = -base.ym; - if (base.ym > 13) - base.ym = 13; - else if (base.ym < -13) - base.ym = -13; + if (base.ym > 9) + base.ym = 9; + else if (base.ym < -9) + base.ym = -9; } base.ym = base.ym + 0.5 * frame_ratio; |
|
From: Ingo R. <gr...@us...> - 2004-04-25 22:10:29
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6153/images/shared Added Files: bullet-1.png bullet-2.png bullet-3.png bullet-4.png Log Message: - bullet gfx --- NEW FILE: bullet-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bullet-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bullet-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bullet-3.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 21:56:02
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/data Modified Files: supertux.strf Added Files: intro.txt extro.txt Log Message: - memleak fix and menu fix from MatzeB - little bullet tweaking from myself - added story --- NEW FILE: intro.txt --- - Gwen gets captured! - Tux and Gwen were out having a nice picnic on the ice fields of Antarctica. Suddenly, a creature jumped from behind an ice bush, there was a flash, and Tux fell asleep! When Tux wakes up, he finds that Gwen is missing. Where she lay before now lies a letter. "Tux, my arch enemy!" says the letter. "I have captured your beautiful Gwen and have taken her to my fortress. The path to my fortress is littered with my minions. Give up on the thought of trying to reclaim her, you haven't a chance! -Nolok" Tux looks and see Nolok's fortress in the distance. Determined to save his beloved Gwen, he begins his journey. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- supertux.strf 25 Apr 2004 17:17:10 -0000 1.22 +++ supertux.strf 25 Apr 2004 21:55:23 -0000 1.23 @@ -1,3 +1,4 @@ +;; -*- mode: scheme; -*- (supertux-resources ;; Small Tux Walk (sprite (name "smalltux-walk-left") @@ -155,7 +156,7 @@ (images "shared/tux-duck-left.png")) (sprite (name "largetux-duck-right") (x-hotspot 6) - (y-hotspot 6) + (y-hotspot 2) (images "shared/tux-duck-right.png")) @@ -473,6 +474,15 @@ "shared/iceflower-3.png" "shared/iceflower-2.png" "shared/iceflower-1.png")) + + (sprite (name "bullet") + (x-hotspot 12) + (x-hotspot 12) + (fps 20) + (images "shared/bullet-1.png" + "shared/bullet-2.png" + "shared/bullet-3.png" + "shared/bullet-4.png")) ) ;; EOF ;; --- NEW FILE: extro.txt --- - Entering Nolok's Throne Room! - Tux ran into Nolok's throne room, frantically searching for his beloved. Alas, he found neither Penny nor Nolok there, but instead, another note. "Well done, Tux, well done. If you are reading this, you have removed my control over this icy fortress. But as you can see, your beloved Penny is not here. What you did not realize is that this is just one of my many fortresses, spread far across the lands! "Tux, your ambition is most honorable, but futile nonetheless. With every fortress you conquer of mine, I will escape to another, and take Penny with me. Do not be silly... it is best that you give up now." Tux was sadly leaving the room, when he felt something beneath his foot... an envelope, addressed to him! Inside was a roughly sketched map with fortresses drawn in various lands. On the corner of the map was Penny's signature, a drawing of the ice flower. Tux ran out of the fortress, map in hand. No, he decided, he would not give up. Penny was counting on him. |
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/src Modified Files: button.cpp configfile.cpp defines.h high_scores.cpp level.cpp lispreader.cpp menu.cpp menu.h setup.cpp special.cpp special.h sprite_manager.cpp text.cpp texture.cpp texture.h tile.cpp tile.h title.cpp worldmap.cpp worldmap.h Log Message: - memleak fix and menu fix from MatzeB - little bullet tweaking from myself - added story Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- tile.h 20 Apr 2004 11:09:34 -0000 1.12 +++ tile.h 25 Apr 2004 21:55:39 -0000 1.13 @@ -31,8 +31,12 @@ /** Tile Class */ -struct Tile +class Tile { +public: + Tile(); + ~Tile(); + int id; std::vector<Surface*> images; Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- menu.cpp 24 Apr 2004 18:03:35 -0000 1.56 +++ menu.cpp 25 Apr 2004 21:55:39 -0000 1.57 @@ -223,8 +223,6 @@ pos_x = screen->w/2; pos_y = screen->h/2; - has_backitem = false; - last_id = 0; arrange_left = 0; active_item = 0; effect.init(false); @@ -239,15 +237,6 @@ void Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_, int id, int* int_p) { - if(kind_ == MN_BACK) - has_backitem = true; - - if(id == -1 && item.size() == (unsigned)last_id) - { - id = last_id; - last_id++; - } - additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p)); } @@ -255,9 +244,6 @@ void Menu::additem(MenuItem* pmenu_item) { - if(pmenu_item->kind == MN_BACK) - has_backitem = true; - item.push_back(*pmenu_item); delete pmenu_item; } Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- defines.h 22 Apr 2004 20:41:39 -0000 1.23 +++ defines.h 25 Apr 2004 21:55:39 -0000 1.24 @@ -69,9 +69,8 @@ #define START_LIVES 4 -#define MAX_BULLETS 1 +#define MAX_BULLETS 2 -#define GRAVITY 1.0 #define YM_FOR_JUMP 6.0 #define WALK_ACCELERATION_X 0.03 #define RUN_ACCELERATION_X 0.04 Index: sprite_manager.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite_manager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sprite_manager.cpp 20 Apr 2004 11:09:34 -0000 1.2 +++ sprite_manager.cpp 25 Apr 2004 21:55:39 -0000 1.3 @@ -29,7 +29,8 @@ void SpriteManager::load_resfile(const std::string& filename) { - lisp_object_t* cur = lisp_read_from_file(filename); + lisp_object_t* root_obj = lisp_read_from_file(filename); + lisp_object_t* cur = root_obj; if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-resources") != 0) return; @@ -62,6 +63,8 @@ cur = lisp_cdr(cur); } + + lisp_free(root_obj); } Sprite* Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- special.cpp 22 Apr 2004 20:14:49 -0000 1.26 +++ special.cpp 25 Apr 2004 21:55:39 -0000 1.27 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <assert.h> +#include <iostream> #include "SDL.h" #include "defines.h" #include "special.h" @@ -30,8 +31,7 @@ #include "sprite_manager.h" #include "resources.h" -Surface* img_bullet; - +Sprite* img_bullet; Sprite* img_star; Sprite* img_growup; Sprite* img_iceflower; @@ -39,6 +39,9 @@ #define GROWUP_SPEED 1.0f +#define BULLET_STARTING_YM 0 +#define BULLET_XM 6 + void Bullet::init(float x, float y, float xm, Direction dir) { @@ -79,6 +82,10 @@ void Bullet::action(double frame_ratio) { + frame_ratio *= 0.5f; + + float old_y = base.y; + base.x = base.x + base.xm * frame_ratio; base.y = base.y + base.ym * frame_ratio; @@ -86,11 +93,15 @@ if (issolid(base.x, base.y + 4) || issolid(base.x, base.y)) { - base.ym = -base.ym; - base.y = (int)(base.y / 32) * 32; + base.y = old_y; + base.ym = -base.ym; + if (base.ym > 13) + base.ym = 13; + else if (base.ym < -13) + base.ym = -13; } - base.ym = base.ym + GRAVITY; + base.ym = base.ym + 0.5 * frame_ratio; if (base.x < scroll_x || base.x > scroll_x + screen->w || @@ -110,8 +121,7 @@ if (base.x >= scroll_x - base.width && base.x <= scroll_x + screen->w) { - img_bullet->draw( base.x - scroll_x, base.y, 255, - NO_UPDATE); + img_bullet->draw(base.x - scroll_x, base.y); } } @@ -342,8 +352,7 @@ img_star = sprite_manager->load("star"); img_1up = sprite_manager->load("1up"); - img_bullet = new Surface(datadir + "/images/shared/bullet.png", - USE_ALPHA); + img_bullet = sprite_manager->load("bullet"); } void free_special_gfx() Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- worldmap.cpp 25 Apr 2004 12:29:23 -0000 1.48 +++ worldmap.cpp 25 Apr 2004 21:55:39 -0000 1.49 @@ -83,8 +83,6 @@ return NONE; } -TileManager* TileManager::instance_ = 0; - TileManager::TileManager() { std::string stwt_filename = datadir + "images/worldmap/antarctica.stwt"; @@ -143,6 +141,14 @@ { assert(0); } + + lisp_free(root_obj); +} + +TileManager::~TileManager() +{ + for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) + delete *i; } Tile* @@ -152,6 +158,8 @@ return tiles[i]; } +//--------------------------------------------------------------------------- + Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { @@ -164,6 +172,11 @@ input_direction = NONE; } +Tux::~Tux() +{ + delete sprite; +} + void Tux::draw(const Point& offset) { @@ -268,8 +281,21 @@ } } +//--------------------------------------------------------------------------- +Tile::Tile() +{ +} + +Tile::~Tile() +{ + delete sprite; +} + +//--------------------------------------------------------------------------- + WorldMap::WorldMap() { + tile_manager = new TileManager(); tux = new Tux(this); width = 20; @@ -291,6 +317,11 @@ WorldMap::~WorldMap() { delete tux; + delete tile_manager; + + delete level_sprite; + delete leveldot_green; + delete leveldot_red; } void @@ -362,38 +393,42 @@ cur = lisp_cdr(cur); } } + + lisp_free(root_obj); } void WorldMap::get_level_title(Levels::pointer level) { -/** get level's title */ -level->title = "<no title>"; + /** get level's title */ + level->title = "<no title>"; -FILE * fi; -lisp_object_t* root_obj = 0; -fi = fopen((datadir + "levels/" + level->name).c_str(), "r"); -if (fi == NULL) + FILE * fi; + lisp_object_t* root_obj = 0; + fi = fopen((datadir + "levels/" + level->name).c_str(), "r"); + if (fi == NULL) { - perror((datadir + "levels/" + level->name).c_str()); - return; + perror((datadir + "levels/" + level->name).c_str()); + return; } -lisp_stream_t stream; -lisp_stream_init_file (&stream, fi); -root_obj = lisp_read (&stream); + lisp_stream_t stream; + lisp_stream_init_file (&stream, fi); + root_obj = lisp_read (&stream); -if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) + if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) { - printf("World: Parse Error in file %s", level->name.c_str()); + printf("World: Parse Error in file %s", level->name.c_str()); } -if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) + if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { - LispReader reader(lisp_cdr(root_obj)); - reader.read_string("name", &level->title); + LispReader reader(lisp_cdr(root_obj)); + reader.read_string("name", &level->title); } -fclose(fi); + lisp_free(root_obj); + + fclose(fi); } void @@ -635,7 +670,7 @@ && p.y >= 0 && p.y < height); - return TileManager::instance()->get(tilemap[width * p.y + p.x]); + return tile_manager->get(tilemap[width * p.y + p.x]); } WorldMap::Level* @@ -797,66 +832,69 @@ std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; - if (access(filename.c_str(), F_OK) == 0) - { - lisp_object_t* cur = lisp_read_from_file(filename); + if (access(filename.c_str(), F_OK) != 0) + return; + + lisp_object_t* savegame = lisp_read_from_file(filename); + lisp_object_t* cur = savegame; - if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) - return; + if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) + return; - cur = lisp_cdr(cur); - LispReader reader(cur); - - reader.read_int("lives", &player_status.lives); - reader.read_int("score", &player_status.score); - reader.read_int("distros", &player_status.distros); + cur = lisp_cdr(cur); + LispReader reader(cur); - if (player_status.lives < 0) - player_status.lives = START_LIVES; + reader.read_int("lives", &player_status.lives); + reader.read_int("score", &player_status.score); + reader.read_int("distros", &player_status.distros); - lisp_object_t* tux_cur = 0; - if (reader.read_lisp("tux", &tux_cur)) - { - Point p; - std::string back_str = "none"; + if (player_status.lives < 0) + player_status.lives = START_LIVES; - LispReader tux_reader(tux_cur); - tux_reader.read_int("x", &p.x); - tux_reader.read_int("y", &p.y); - tux_reader.read_string("back", &back_str); - - tux->back_direction = string_to_direction(back_str); - tux->set_tile_pos(p); - } + lisp_object_t* tux_cur = 0; + if (reader.read_lisp("tux", &tux_cur)) + { + Point p; + std::string back_str = "none"; - lisp_object_t* level_cur = 0; - if (reader.read_lisp("levels", &level_cur)) + LispReader tux_reader(tux_cur); + tux_reader.read_int("x", &p.x); + tux_reader.read_int("y", &p.y); + tux_reader.read_string("back", &back_str); + + tux->back_direction = string_to_direction(back_str); + tux->set_tile_pos(p); + } + + lisp_object_t* level_cur = 0; + if (reader.read_lisp("levels", &level_cur)) + { + while(level_cur) { - while(level_cur) - { - lisp_object_t* sym = lisp_car(lisp_car(level_cur)); - lisp_object_t* data = lisp_cdr(lisp_car(level_cur)); + lisp_object_t* sym = lisp_car(lisp_car(level_cur)); + lisp_object_t* data = lisp_cdr(lisp_car(level_cur)); - if (strcmp(lisp_symbol(sym), "level") == 0) - { - std::string name; - bool solved = false; + if (strcmp(lisp_symbol(sym), "level") == 0) + { + std::string name; + bool solved = false; - LispReader level_reader(data); - level_reader.read_string("name", &name); - level_reader.read_bool("solved", &solved); + LispReader level_reader(data); + level_reader.read_string("name", &name); + level_reader.read_bool("solved", &solved); - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) - { - if (name == i->name) - i->solved = solved; - } + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (name == i->name) + i->solved = solved; } - - level_cur = lisp_cdr(level_cur); } + + level_cur = lisp_cdr(level_cur); } } + + lisp_free(savegame); } } // namespace WorldMapNS Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- level.cpp 25 Apr 2004 13:51:19 -0000 1.50 +++ level.cpp 25 Apr 2004 21:55:39 -0000 1.51 @@ -127,6 +127,7 @@ } + lisp_free(root_obj); fclose(fi); snprintf(str, 1024, "%s.png", filename); @@ -203,6 +204,7 @@ Level::Level() : img_bkgd(0) { + init_defaults(); } Level::Level(const std::string& subset, int level) @@ -501,6 +503,7 @@ else endpos = 32*(width-15); + lisp_free(root_obj); fclose(fi); return 0; } Index: special.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- special.h 20 Apr 2004 19:55:10 -0000 1.16 +++ special.h 25 Apr 2004 21:55:39 -0000 1.17 @@ -17,9 +17,6 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#define BULLET_STARTING_YM 1 -#define BULLET_XM 5 - #ifndef SUPERTUX_SPECIAL_H #define SUPERTUX_SPECIAL_H Index: button.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- button.cpp 20 Apr 2004 11:09:33 -0000 1.16 +++ button.cpp 25 Apr 2004 21:55:23 -0000 1.17 @@ -57,7 +57,8 @@ dest.y = 0; dest.w = icon->w; dest.h = icon->h; - SDL_SoftStretch(icon->impl->sdl_surface, NULL, icon->impl->sdl_surface, &dest); + SDL_SoftStretch(icon->impl->get_sdl_surface(), NULL, + icon->impl->get_sdl_surface(), &dest); } else icon = new Surface(filename,USE_ALPHA); Index: text.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/text.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- text.cpp 20 Apr 2004 11:09:34 -0000 1.10 +++ text.cpp 25 Apr 2004 21:55:39 -0000 1.11 @@ -55,7 +55,7 @@ chars = new Surface(file, USE_ALPHA); // Load shadow font. - conv = SDL_DisplayFormatAlpha(chars->impl->sdl_surface); + conv = SDL_DisplayFormatAlpha(chars->impl->get_sdl_surface()); pixels = conv->w * conv->h; SDL_LockSurface(conv); for(i = 0; i < pixels; ++i) Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- lispreader.cpp 25 Apr 2004 14:16:10 -0000 1.14 +++ lispreader.cpp 25 Apr 2004 21:55:39 -0000 1.15 @@ -49,10 +49,10 @@ static char token_string[MAX_TOKEN_LENGTH + 1] = ""; static int token_length = 0; -static lisp_object_t end_marker = { LISP_TYPE_EOF , {0,0} }; -static lisp_object_t error_object = { LISP_TYPE_PARSE_ERROR , {0,0} }; -static lisp_object_t close_paren_marker = { LISP_TYPE_PARSE_ERROR , {0,0} }; -static lisp_object_t dot_marker = { LISP_TYPE_PARSE_ERROR , {0,0} }; +static lisp_object_t end_marker = { LISP_TYPE_EOF, {{0, 0}} }; +static lisp_object_t error_object = { LISP_TYPE_PARSE_ERROR , {{0,0}} }; +static lisp_object_t close_paren_marker = { LISP_TYPE_PARSE_ERROR , {{0,0}} }; +static lisp_object_t dot_marker = { LISP_TYPE_PARSE_ERROR , {{0,0}} }; static void _token_clear (void) Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- setup.cpp 25 Apr 2004 16:46:55 -0000 1.57 +++ setup.cpp 25 Apr 2004 21:55:39 -0000 1.58 @@ -55,6 +55,8 @@ #include "player.h" +void display_text_file(char *filename); + #ifdef WIN32 #define mkdir(dir, mode) mkdir(dir) // on win32 we typically don't want LFS paths @@ -437,21 +439,21 @@ load_game_menu->additem(MN_LABEL,"Start Game",0,0); load_game_menu->additem(MN_HL,"",0,0); - load_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0); - load_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0); - load_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0); - load_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0); - load_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0); + load_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0, 1); + load_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2); + load_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0, 3); + load_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0, 4); + load_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0, 5); load_game_menu->additem(MN_HL,"",0,0); load_game_menu->additem(MN_BACK,"Back",0,0); save_game_menu->additem(MN_LABEL,"Save Game",0,0); save_game_menu->additem(MN_HL,"",0,0); - save_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0); - save_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0); - save_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0); - save_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0); - save_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0); + save_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0, 1); + save_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2); + save_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0, 3); + save_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0, 4); + save_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0, 5); save_game_menu->additem(MN_HL,"",0,0); save_game_menu->additem(MN_BACK,"Back",0,0); @@ -489,14 +491,14 @@ { int slot = load_game_menu->check(); - if(slot != -1 && load_game_menu->get_item(slot).kind == MN_ACTION) + if(slot != -1 && load_game_menu->get_item_by_id(slot).kind == MN_ACTION) { char slotfile[1024]; - snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot-1); + snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot); if (access(slotfile, F_OK) != 0) { - draw_intro(); + display_text_file("intro.txt"); } WorldMapNS::WorldMap worldmap; Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- worldmap.h 24 Apr 2004 14:49:04 -0000 1.22 +++ worldmap.h 25 Apr 2004 21:55:39 -0000 1.23 @@ -46,8 +46,12 @@ int y; }; -struct Tile +class Tile { +public: + Tile(); + ~Tile(); + Surface* sprite; // Directions in which Tux is allowed to walk from this tile @@ -65,13 +69,11 @@ private: typedef std::vector<Tile*> Tiles; Tiles tiles; - static TileManager* instance_ ; - TileManager(); public: - static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); } + TileManager(); + ~TileManager(); - void load(); Tile* get(int i); }; @@ -102,6 +104,7 @@ void stop(); public: Tux(WorldMap* worldmap_); + ~Tux(); void draw(const Point& offset); void update(float delta); @@ -133,6 +136,8 @@ int width; int height; + TileManager* tile_manager; + public: struct Level { Index: configfile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/configfile.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configfile.cpp 21 Apr 2004 17:45:17 -0000 1.3 +++ configfile.cpp 25 Apr 2004 21:55:39 -0000 1.4 @@ -104,6 +104,8 @@ reader.read_int ("keyboard-left", &keymap.left); reader.read_int ("keyboard-right", &keymap.right); reader.read_int ("keyboard-fire", &keymap.fire); + + lisp_free(root_obj); } void saveconfig (void) Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/texture.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- texture.cpp 20 Apr 2004 11:09:34 -0000 1.14 +++ texture.cpp 25 Apr 2004 21:55:39 -0000 1.15 @@ -29,7 +29,7 @@ Surface::Surfaces Surface::surfaces; SurfaceData::SurfaceData(SDL_Surface* temp, int use_alpha_) - : type(SURFACE), use_alpha(use_alpha_) + : type(SURFACE), surface(0), use_alpha(use_alpha_) { // Copy the given surface and make sure that it is not stored in // video memory @@ -40,24 +40,26 @@ temp->format->Gmask, temp->format->Bmask, temp->format->Amask); + if(!surface) + st_abort("No memory left.", ""); SDL_SetAlpha(temp,0,0); SDL_BlitSurface(temp, NULL, surface, NULL); } SurfaceData::SurfaceData(const std::string& file_, int use_alpha_) - : type(LOAD), file(file_), use_alpha(use_alpha_) + : type(LOAD), surface(0), file(file_), use_alpha(use_alpha_) { } SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_) - : type(LOAD_PART), file(file_), use_alpha(use_alpha_), + : type(LOAD_PART), surface(0), file(file_), use_alpha(use_alpha_), x(x_), y(y_), w(w_), h(h_) { } SurfaceData::~SurfaceData() { - + SDL_FreeSurface(surface); } SurfaceImpl* @@ -321,6 +323,22 @@ return sdl_surface; } +//--------------------------------------------------------------------------- + +SurfaceImpl::SurfaceImpl() +{ +} + +SurfaceImpl::~SurfaceImpl() +{ + SDL_FreeSurface(sdl_surface); +} + +SDL_Surface* SurfaceImpl::get_sdl_surface() const +{ + return sdl_surface; +} + #ifndef NOOPENGL SurfaceOpenGL::SurfaceOpenGL(SDL_Surface* surf, int use_alpha) { @@ -351,7 +369,6 @@ SurfaceOpenGL::~SurfaceOpenGL() { - SDL_FreeSurface(sdl_surface); glDeleteTextures(1, &gl_texture); } @@ -367,7 +384,7 @@ h = power_of_two(surf->h), #if SDL_BYTEORDER == SDL_BIG_ENDIAN - conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel, + conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff); #else conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel, @@ -432,10 +449,8 @@ glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); - /* Avoid compiler warnings */ - if(update) - {} - + (void) update; // avoid compiler warning + return 0; } @@ -463,9 +478,7 @@ glDisable(GL_TEXTURE_2D); - /* Avoid compiler warnings */ - if(update) - {} + (void) update; // avoid compiler warning return 0; } @@ -599,7 +612,6 @@ SurfaceSDL::~SurfaceSDL() { - SDL_FreeSurface(sdl_surface); } /* EOF */ Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- title.cpp 25 Apr 2004 15:21:06 -0000 1.60 +++ title.cpp 25 Apr 2004 21:55:39 -0000 1.61 @@ -79,7 +79,8 @@ { st_subset subset; subset.load(level_subsets.item[i]); - contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, contrib_subset_menu); + contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, + contrib_subset_menu, i+1); contrib_subsets.push_back(subset); } @@ -96,7 +97,7 @@ int index = contrib_menu->check(); if (index != -1) { - index -= 2; // FIXME: Hack + index -= 1; if (index >= 0 && index <= int(contrib_subsets.size())) { if (current_subset != index) @@ -117,7 +118,7 @@ { Level level; level.load(subset.name, i); - contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0); + contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0, i); } contrib_subset_menu->additem(MN_HL,"",0,0); contrib_subset_menu->additem(MN_BACK, "Back", 0, 0); @@ -135,9 +136,8 @@ int index = contrib_subset_menu->check(); if (index != -1) { - if (contrib_subset_menu->get_item(index).kind == MN_ACTION) + if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) { - index -= 1; // FIXME: Hack std::cout << "Sarting level: " << index << std::endl; GameSession session(current_contrib_subset, index, ST_GL_PLAY); session.run(); @@ -453,7 +453,9 @@ draw_background(); - white_big_text->drawf("- Credits -", 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2); + if (strcmp(file, "CREDITS") == 0) + white_big_text->drawf("- SuperTux " VERSION " -", + 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2); y = 0; for(int i = 0; i < length; i++) Index: high_scores.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- high_scores.cpp 20 Apr 2004 11:09:33 -0000 1.16 +++ high_scores.cpp 25 Apr 2004 21:55:39 -0000 1.17 @@ -74,9 +74,7 @@ } fclose(fi); - -printf("name=%s\n", hs_name.c_str()); -printf("score=%i\n\n", hs_score); + lisp_free(root_obj); } void save_hs(int score) Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- tile.cpp 20 Apr 2004 11:09:34 -0000 1.13 +++ tile.cpp 25 Apr 2004 21:55:39 -0000 1.14 @@ -25,6 +25,24 @@ TileManager* TileManager::instance_ = 0; std::vector<TileGroup>* TileManager::tilegroups_ = 0; +Tile::Tile() +{ +} + +Tile::~Tile() +{ + for(std::vector<Surface*>::iterator i = images.begin(); i != images.end(); + ++i) { + delete *i; + } + for(std::vector<Surface*>::iterator i = editor_images.begin(); + i != editor_images.end(); ++i) { + delete *i; + } +} + +//--------------------------------------------------------------------------- + TileManager::TileManager() { std::string filename = datadir + "images/tilesets/supertux.stgt"; @@ -33,6 +51,12 @@ void TileManager::load_tileset(std::string filename) { + // free old tiles + for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { + delete *i; + } + tiles.clear(); + lisp_object_t* root_obj = lisp_read_from_file(filename); if (!root_obj) @@ -142,6 +166,8 @@ { assert(0); } + + lisp_free(root_obj); } void Index: texture.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/texture.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- texture.h 20 Apr 2004 11:09:34 -0000 1.17 +++ texture.h 25 Apr 2004 21:55:39 -0000 1.18 @@ -90,23 +90,28 @@ this class */ class SurfaceImpl { -public: +protected: SDL_Surface* sdl_surface; + +public: int w; int h; public: + SurfaceImpl(); + virtual ~SurfaceImpl(); + /** Return 0 on success, -2 if surface needs to be reloaded */ virtual int draw(float x, float y, Uint8 alpha, bool update) = 0; virtual int draw_bg(Uint8 alpha, bool update) = 0; virtual int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, bool update) = 0; + + SDL_Surface* get_sdl_surface() const; // @evil@ try to avoid this function }; class SurfaceSDL : public SurfaceImpl { public: - -public: SurfaceSDL(SDL_Surface* surf, int use_alpha); SurfaceSDL(const std::string& file, int use_alpha); SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha); Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- menu.h 24 Apr 2004 17:48:49 -0000 1.49 +++ menu.h 25 Apr 2004 21:55:39 -0000 1.50 @@ -138,8 +138,6 @@ // position of the menu (ie. center of the menu, not top/left) int pos_x; int pos_y; - bool has_backitem; - int last_id; /** input event for the menu (up, down, left, right, etc.) */ MenuAction menuaction; |
|
From: Ingo R. <gr...@us...> - 2004-04-25 21:34:18
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10261/tilesets Modified Files: supertux.stgt waves-0.png waves-1.png waves-2.png Log Message: - smoothed water a little bit - added new cloud - fixed stalactit look a bit Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- supertux.stgt 19 Apr 2004 14:14:46 -0000 1.17 +++ supertux.stgt 25 Apr 2004 11:57:19 -0000 1.18 @@ -135,17 +135,17 @@ (solid #t)) (tile (id 44) - (images "coin1.png" "coin2.png" "coin3.png") + (images "coin1.png" "coin2.png" "coin3.png" "coin2.png") (distro #t) - (anim-speed 25)) + (anim-speed 45)) (tile (id 45) - (images "coin1.png" "coin2.png" "coin3.png") + (images "coin1.png" "coin2.png" "coin3.png" "coin2.png") (distro #t) - (anim-speed 25)) + (anim-speed 45)) (tile (id 46) - (images "coin1.png" "coin2.png" "coin3.png") + (images "coin1.png" "coin2.png" "coin3.png" "coin2.png") (distro #t) - (anim-speed 25)) + (anim-speed 45)) (tile (id 47) (images "block4.png") @@ -240,7 +240,7 @@ (tile (id 76) (images "waves-0.png" "waves-1.png" "waves-2.png") (water #t) - (anim-speed 25)) + (anim-speed 50)) ;; Normal brick (tile (id 77) @@ -265,7 +265,9 @@ (solid #f)) (tile (id 82) - (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png") +;; (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png") + (images "coin1.png" "coin2.png" "coin3.png" "coin2.png" ) + (anim-speed 45) (solid #f) (distro #t)) Index: waves-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsIkQ5Uc and /tmp/cvsSlrINx differ Index: waves-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsDlmnIf and /tmp/cvsvo0OCA differ Index: waves-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-2.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsB6t4Eh and /tmp/cvsvAKNAC differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 20:23:04
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9176 Modified Files: level19.stl Log Message: - fixed 'impossible to make' situation Index: level19.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level19.stl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- level19.stl 25 Apr 2004 12:34:41 -0000 1.5 +++ level19.stl 25 Apr 2004 20:22:35 -0000 1.6 @@ -23,7 +23,7 @@ 36 43 0 0 0 38 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 43 0 0 0 40 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 36 36 36 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 36 36 36 36 36 36 36 36 36 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 36 36 36 36 36 36 41 41 41 41 36 36 36 36 36 36 36 36 36 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 41 41 41 41 41 41 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38 36 36 36 36 43 0 0 0 0 38 36 36 36 36 36 36 36 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 36 36 36 36 36 36 36 36 36 36 36 36 36 36 - 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 38 36 43 0 0 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 41 41 41 42 0 0 0 0 38 36 36 36 36 36 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 36 36 36 36 36 36 41 36 36 36 36 36 + 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 0 0 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 38 36 43 0 0 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 41 41 41 42 0 0 0 0 38 36 36 36 36 36 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 36 36 36 36 36 36 41 36 36 36 36 36 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 0 0 0 33 38 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 33 0 33 33 0 33 33 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38 36 36 36 36 36 41 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 33 33 33 33 33 33 33 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38 36 36 36 36 42 0 38 36 36 36 36 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 0 0 0 0 0 0 0 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 29 0 0 0 35 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 35 39 0 35 39 0 35 39 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 0 38 36 36 36 36 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 35 37 37 37 37 37 37 39 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 41 41 42 0 0 40 36 36 36 43 36 43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 33 0 33 33 33 33 33 0 33 33 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 33 33 33 33 33 33 33 33 33 0 0 33 33 33 33 33 33 33 33 33 33 0 0 0 0 0 0 0 0 0 0 0 0 38 36 43 0 0 0 44 44 44 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 57 58 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 33 33 33 33 33 33 33 33 33 0 0 0 0 0 0 0 0 0 38 43 0 38 43 0 40 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 0 0 0 0 33 33 33 33 33 0 0 0 0 0 0 0 33 33 33 33 33 0 0 0 0 0 38 36 36 36 43 0 0 0 0 0 44 0 44 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 40 41 41 41 41 41 41 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 38 36 36 43 @@ -82,7 +82,7 @@ (mrbomb (x 2152) (y 361)) (mrbomb (x 2257) (y 363)) (spiky (x 2864) (y 370)) - (money (x 4723) (y 345)) + (money (x 4738) (y 346)) (mrbomb (x 6252) (y 302)) (snowball (x 5836) (y 376)) (snowball (x 5789) (y 375)) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:59:59
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4672 Modified Files: level11.stl level12.stl level26.stl Log Message: - fixed some gradients Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- level26.stl 25 Apr 2004 12:34:41 -0000 1.3 +++ level26.stl 25 Apr 2004 19:59:01 -0000 1.4 @@ -9,12 +9,12 @@ (start_pos_y 170) (background "") (music "fortress.mod") - (bkgd_red_top 150) - (bkgd_green_top 150) - (bkgd_blue_top 150) + (bkgd_red_top 0) + (bkgd_green_top 0) + (bkgd_blue_top 0) (bkgd_red_bottom 150) - (bkgd_green_bottom 150) - (bkgd_blue_bottom 150) + (bkgd_green_bottom 0) + (bkgd_blue_bottom 0) (time 300) (gravity 10) (particle_system "") Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- level12.stl 25 Apr 2004 12:34:41 -0000 1.5 +++ level12.stl 25 Apr 2004 19:59:00 -0000 1.6 @@ -9,11 +9,11 @@ (start_pos_y 170) (background "") (music "Mortimers_chipdisko.mod") - (bkgd_red_top 150) - (bkgd_green_top 150) - (bkgd_blue_top 150) - (bkgd_red_bottom 150) - (bkgd_green_bottom 150) + (bkgd_red_top 0) + (bkgd_green_top 0) + (bkgd_blue_top 0) + (bkgd_red_bottom 0) + (bkgd_green_bottom 0) (bkgd_blue_bottom 150) (time 300) (gravity 10) Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- level11.stl 25 Apr 2004 12:34:41 -0000 1.5 +++ level11.stl 25 Apr 2004 19:58:54 -0000 1.6 @@ -9,11 +9,11 @@ (start_pos_y 170) (background "") (music "Mortimers_chipdisko.mod") - (bkgd_red_top 150) - (bkgd_green_top 150) - (bkgd_blue_top 150) - (bkgd_red_bottom 150) - (bkgd_green_bottom 150) + (bkgd_red_top 0) + (bkgd_green_top 0) + (bkgd_blue_top 0) + (bkgd_red_bottom 0) + (bkgd_green_bottom 0) (bkgd_blue_bottom 150) (time 300) (gravity 10) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:54:15
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3382 Modified Files: level10.stl level14.stl level21.stl level22.stl level23.stl level3.stl level4.stl level5.stl level6.stl level7.stl level8.stl level9.stl Log Message: - replaced backgrounds with new ones Index: level21.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level21.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level21.stl 24 Apr 2004 15:02:11 -0000 1.4 +++ level21.stl 25 Apr 2004 19:51:44 -0000 1.5 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level5.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level5.stl 25 Apr 2004 12:34:42 -0000 1.6 +++ level5.stl 25 Apr 2004 19:52:05 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level23.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level23.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level23.stl 24 Apr 2004 15:02:11 -0000 1.4 +++ level23.stl 25 Apr 2004 19:51:57 -0000 1.5 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level6.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level6.stl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- level6.stl 25 Apr 2004 12:34:42 -0000 1.5 +++ level6.stl 25 Apr 2004 19:52:06 -0000 1.6 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level8.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level8.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level8.stl 25 Apr 2004 12:34:42 -0000 1.6 +++ level8.stl 25 Apr 2004 19:52:17 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level7.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level7.stl 25 Apr 2004 12:34:42 -0000 1.6 +++ level7.stl 25 Apr 2004 19:52:16 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level14.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level14.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level14.stl 24 Apr 2004 15:02:09 -0000 1.4 +++ level14.stl 25 Apr 2004 19:51:42 -0000 1.5 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level4.stl 25 Apr 2004 12:34:42 -0000 1.6 +++ level4.stl 25 Apr 2004 19:52:03 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level9.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level9.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level9.stl 25 Apr 2004 12:34:42 -0000 1.6 +++ level9.stl 25 Apr 2004 19:52:17 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level3.stl 25 Apr 2004 12:34:41 -0000 1.6 +++ level3.stl 25 Apr 2004 19:52:00 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level10.stl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- level10.stl 25 Apr 2004 12:34:41 -0000 1.7 +++ level10.stl 25 Apr 2004 19:51:39 -0000 1.8 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level22.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level22.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level22.stl 24 Apr 2004 15:02:11 -0000 1.4 +++ level22.stl 25 Apr 2004 19:51:44 -0000 1.5 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 170) - (background "arctis.png") + (background "arctis2.jpg") (music "fortress.mod") (bkgd_red_top 150) (bkgd_green_top 150) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:46:56
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12910 Modified Files: level26.stl Log Message: - added gradient Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- level26.stl 24 Apr 2004 15:02:11 -0000 1.1 +++ level26.stl 25 Apr 2004 12:14:02 -0000 1.2 @@ -9,12 +9,12 @@ (start_pos_y 170) (background "") (music "fortress.mod") - (bkgd_red_top 150) - (bkgd_green_top 150) - (bkgd_blue_top 150) - (bkgd_red_bottom 150) - (bkgd_green_bottom 150) - (bkgd_blue_bottom 150) + (bkgd_red_top 0) + (bkgd_green_top 0) + (bkgd_blue_top 0) + (bkgd_red_bottom 155) + (bkgd_green_bottom 0) + (bkgd_blue_bottom 0) (time 300) (gravity 10) (particle_system "") |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:21:07
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6041/data/levels/test Modified Files: level2.stl Log Message: - some minor improvements in the gfx Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level2.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- level2.stl 12 Apr 2004 22:53:15 -0000 1.1 +++ level2.stl 25 Apr 2004 14:34:00 -0000 1.2 @@ -5,7 +5,7 @@ (author "Ingo Ruhnke") (width 100) (height 15) - (background "") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red 150) (bkgd_green 200) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:19:55
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6041/data/images/tilesets Modified Files: background4.png background5.png background6.png Log Message: - some minor improvements in the gfx Index: background4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/background4.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsJ60tBF and /tmp/cvspLGOMR differ Index: background5.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/background5.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsoGUWlR and /tmp/cvso5u8n4 differ Index: background6.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/background6.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsN1gaxT and /tmp/cvsQbDMA6 differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:18:18
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22073 Modified Files: worldmap.stwm Log Message: - removed the 'double' path Index: worldmap.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/worldmap.stwm,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- worldmap.stwm 24 Apr 2004 19:40:18 -0000 1.11 +++ worldmap.stwm 25 Apr 2004 18:35:44 -0000 1.12 @@ -10,9 +10,9 @@ 9 9 9 11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9 9 14 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 22 58 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9 9 9 9 9 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9 9 9 15 19 59 19 20 13 9 9 15 31 35 29 29 28 19 19 19 23 16 12 9 9 9 11 22 19 24 25 26 23 12 11 16 16 12 9 9 9 - 9 9 15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 40 39 20 18 13 9 9 11 22 19 19 30 36 34 26 23 22 19 19 23 12 9 9 - 9 9 15 19 47 19 23 22 19 19 19 19 24 26 47 19 19 19 47 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9 9 - 9 9 15 19 37 39 19 48 40 40 40 39 30 28 41 40 40 40 44 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9 9 + 9 9 15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 39 19 20 18 13 9 9 11 22 19 19 30 36 34 26 23 22 19 19 23 12 9 9 + 9 9 15 19 47 19 23 22 19 19 19 19 24 26 47 24 26 47 19 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9 9 + 9 9 15 19 37 39 19 48 40 40 40 39 30 28 47 30 28 37 40 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9 9 9 9 15 19 19 47 19 47 24 25 26 37 40 40 42 24 25 25 26 20 18 18 18 21 24 25 25 26 37 40 40 40 40 40 39 31 27 23 12 9 9 9 14 18 21 47 19 47 30 29 28 19 24 25 25 33 35 29 28 17 9 9 9 15 30 29 36 27 19 19 19 19 19 19 47 31 34 26 17 9 9 9 9 9 15 37 40 42 19 19 24 25 33 35 29 29 28 20 18 13 9 9 9 14 18 21 31 27 48 40 40 40 40 40 42 30 36 27 17 9 @@ -36,6 +36,7 @@ 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 )) + (levels (level (name "world1/level1.stl") (x 4) @@ -59,10 +60,10 @@ (x 14) (y 9)) (level (name "world1/level8.stl") - (x 16) - (y 8)) + (x 17) + (y 6)) (level (name "world1/level9.stl") - (x 16) + (x 14) (y 6)) (level (name "world1/level10.stl") (x 21) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:17:45
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23156/data Modified Files: supertux.strf Log Message: - moved tux completly to sprites Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- supertux.strf 24 Apr 2004 13:11:29 -0000 1.19 +++ supertux.strf 25 Apr 2004 16:07:49 -0000 1.20 @@ -1,5 +1,19 @@ (supertux-resources - (sprite (name "smalltux") + ;; Small Tux Walk + (sprite (name "smalltux-walk-left") + (fps 15.0) + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-left-1.png" + "shared/smalltux-left-2.png" + "shared/smalltux-left-3.png" + "shared/smalltux-left-4.png" + "shared/smalltux-left-5.png" + "shared/smalltux-left-6.png" + "shared/smalltux-left-7.png" + "shared/smalltux-left-8.png")) + + (sprite (name "smalltux-walk-right") (fps 15.0) (x-hotspot 5) (y-hotspot 9) @@ -12,6 +26,129 @@ "shared/smalltux-right-7.png" "shared/smalltux-right-8.png")) + ;; Small Tux Stand + (sprite (name "smalltux-stand-left") + (fps 15.0) + (x-hotspot 0) + (y-hotspot 0) + (images "shared/smalltux-left-6.png" + )) + + (sprite (name "smalltux-stand-right") + (fps 15.0) + (x-hotspot 0) + (y-hotspot 0) + (images "shared/smalltux-right-6.png")) + + ;; Small Tux Jump + (sprite (name "smalltux-jump-left") + (fps 15.0) + (x-hotspot 0) + (y-hotspot 0) + (images "shared/smalltux-jump-left.png" + )) + + (sprite (name "smalltux-jump-right") + (fps 15.0) + (x-hotspot 0) + (y-hotspot 0) + (images "shared/smalltux-jump-right.png")) + + (sprite (name "smalltux-gameover") + (fps 10.0) + (images "shared/smalltux-gameover-0.png" + "shared/smalltux-gameover-1.png")) + + (sprite (name "smalltux-skid-left") + (x-hotspot 6) + (y-hotspot 8) + (images "shared/smalltux-skid-left.png")) + + (sprite (name "smalltux-skid-right") + (x-hotspot 6) + (y-hotspot 8) + (images "shared/smalltux-skid-right.png")) + + (sprite (name "smalltux-kick-left") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-kick-left-0.png")) + + (sprite (name "smalltux-kick-right") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-kick-right-0.png")) + + (sprite (name "smalltux-grab-left") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-grab-left-0.png")) + + (sprite (name "smalltux-grab-right") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-grab-right-0.png")) + + ;; Large Tux Walk + (sprite (name "largetux-walk-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/largetux-walk-left-0.png" + "shared/largetux-walk-left-1.png" + "shared/largetux-walk-left-2.png" + "shared/largetux-walk-left-3.png" + "shared/largetux-walk-left-4.png" + "shared/largetux-walk-left-5.png")) + + (sprite (name "largetux-walk-right") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/largetux-walk-right-0.png" + "shared/largetux-walk-right-1.png" + "shared/largetux-walk-right-2.png" + "shared/largetux-walk-right-3.png" + "shared/largetux-walk-right-4.png" + "shared/largetux-walk-right-5.png")) + + (sprite (name "largetux-skid-right") + (x-hotspot 2) + (y-hotspot 3) + (images "shared/largetux-skid-right.png")) + + (sprite (name "largetux-skid-left") + (x-hotspot 2) + (y-hotspot 3) + (images "shared/largetux-skid-left.png")) + + (sprite (name "largetux-stand-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-stand-left.png")) + + (sprite (name "largetux-stand-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-stand-right.png")) + + (sprite (name "largetux-jump-left") + (x-hotspot 9) + (y-hotspot 2) + (images "shared/largetux-jump-left-0.png")) + (sprite (name "largetux-jump-right") + (x-hotspot 9) + (y-hotspot 2) + (images "shared/largetux-jump-right-0.png")) + + (sprite (name "largetux-duck-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/tux-duck-left.png")) + (sprite (name "largetux-duck-right") + (x-hotspot 6) + (y-hotspot 6) + (images "shared/tux-duck-right.png")) + + ;; Laptop (sprite (name "laptop-left") (x-hotspot 2) (y-hotspot 3) @@ -38,11 +175,11 @@ (y-hotspot 3) (images "shared/mriceblock-flat-right.png")) -; (sprite (name "laptop-falling-left") -; (images "shared/laptop-falling-left.png")) + ; (sprite (name "laptop-falling-left") + ; (images "shared/laptop-falling-left.png")) -; (sprite (name "laptop-falling-right") -; (images "shared/laptop-falling-right.png")) + ; (sprite (name "laptop-falling-right") + ; (images "shared/laptop-falling-right.png")) (sprite (name "snowball-squished-left") (x-hotspot 1) @@ -101,7 +238,7 @@ "shared/mrbombx-right-1.png")) (sprite (name "mrbomb-explosion") - (fps 15.0) + (fps 15.0) (x-hotspot 32) (y-hotspot 32) (images "shared/mrbomb-explosion.png" @@ -197,56 +334,6 @@ "shared/snowball-right-2.png" "shared/snowball-right-1.png")) - - (sprite (name "largetux-stand-left") - (x-hotspot 5) - (y-hotspot 1) - (images "shared/largetux-stand-left.png")) - - (sprite (name "largetux-stand-right") - (x-hotspot 5) - (y-hotspot 1) - (images "shared/largetux-stand-right.png")) - - (sprite (name "largetux-walk-left") - (x-hotspot 6) - (y-hotspot 2) - (images "shared/largetux-walk-left-0.png" - "shared/largetux-walk-left-1.png" - "shared/largetux-walk-left-2.png" - "shared/largetux-walk-left-3.png" - "shared/largetux-walk-left-4.png" - "shared/largetux-walk-left-5.png")) - - (sprite (name "largetux-walk-right") - (x-hotspot 6) - (y-hotspot 2) - (images "shared/largetux-walk-right-0.png" - "shared/largetux-walk-right-1.png" - "shared/largetux-walk-right-2.png" - "shared/largetux-walk-right-3.png" - "shared/largetux-walk-right-4.png" - "shared/largetux-walk-right-5.png")) - - (sprite (name "largetux-jump-left") - (x-hotspot 9) - (y-hotspot 2) - (images "shared/largetux-jump-left-0.png")) - (sprite (name "largetux-jump-right") - (x-hotspot 9) - (y-hotspot 2) - (images "shared/largetux-jump-right-0.png")) - - - (sprite (name "largetux-duck-left") - (x-hotspot 6) - (y-hotspot 2) - (images "shared/tux-duck-left.png")) - (sprite (name "largetux-duck-right") - (x-hotspot 6) - (y-hotspot 6) - (images "shared/tux-duck-right.png")) - (sprite (name "egg") (images "shared/egg.png")) (sprite (name "1up") @@ -262,48 +349,11 @@ "shared/star-1.png")) (sprite (name "iceflower") (images "shared/iceflower.png" - "shared/iceflower-1.png" - "shared/iceflower-2.png" - "shared/iceflower-3.png" - "shared/iceflower-2.png" - "shared/iceflower-1.png")) - - (sprite (name "smalltux-gameover") - (fps 10.0) - (images "shared/smalltux-gameover-0.png" - "shared/smalltux-gameover-1.png")) - - (sprite (name "smalltux-skid-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/smalltux-skid-left.png")) - - (sprite (name "smalltux-skid-right") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/smalltux-skid-right.png")) - - - (sprite (name "smalltux-kick-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/smalltux-kick-left-0.png")) - - (sprite (name "smalltux-kick-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/smalltux-kick-right-0.png")) - - (sprite (name "smalltux-grab-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/smalltux-grab-left-0.png")) - - (sprite (name "smalltux-grab-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/smalltux-grab-right-0.png")) - + "shared/iceflower-1.png" + "shared/iceflower-2.png" + "shared/iceflower-3.png" + "shared/iceflower-2.png" + "shared/iceflower-1.png")) (sprite (name "largetux-kick-left") (x-hotspot 5) |
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6403 Modified Files: cloud-00.png cloud-01.png cloud-02.png cloud-03.png cloud-10.png cloud-11.png cloud-12.png cloud-13.png Log Message: - added new cloud tile Index: cloud-03.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-03.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsdJWPqw and /tmp/cvsedJLwR differ Index: cloud-02.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-02.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs6TaJnx and /tmp/cvs3StOvS differ Index: cloud-12.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-12.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsAGbzTz and /tmp/cvsCnFi3U differ Index: cloud-13.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-13.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsHlmMgC and /tmp/cvsJKg3rX differ Index: cloud-10.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-10.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsFjJ3Bx and /tmp/cvsjY6ZOS differ Index: cloud-00.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-00.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsgalQWz and /tmp/cvslIjibV differ Index: cloud-01.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-01.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsUoy5nC and /tmp/cvslR0cEX differ Index: cloud-11.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/cloud-11.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs2XJ1qD and /tmp/cvs3IThJY differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:16:45
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22378 Modified Files: Makefile.am Log Message: - fixed makefile a bit Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 22 Apr 2004 15:58:20 -0000 1.6 +++ Makefile.am 25 Apr 2004 18:37:25 -0000 1.7 @@ -1,9 +1,13 @@ EXTRA_DIST = \ + supertux.strf \ $(wildcard sounds/*.wav) \ + images/icon.png \ + images/icon.xpm \ $(wildcard images/*.png) \ $(wildcard images/background/*.png) \ $(wildcard images/highscore/*.png) \ $(wildcard images/icons/*.png) \ + $(wildcard images/icons/*.xpm) \ $(wildcard images/intro/*.png) \ $(wildcard images/leveleditor/*.png) \ $(wildcard images/map/*.png) \ @@ -11,11 +15,14 @@ $(wildcard images/status/*.png) \ $(wildcard images/themes/*/*.png) \ $(wildcard images/worldmap/*.png) \ + $(wildcard images/worldmap/*.stwt) \ $(wildcard images/title/*.png) \ + $(wildcard images/title/*.jpg) \ + $(wildcard images/tilesets/*.png) \ + $(wildcard images/tilesets/*.stgt) \ levels/default/worldmap.stwm \ - $(wildcard levels/default/*.dat) \ - $(wildcard levels/default/*.stl) \ - $(wildcard levels/default/*.stlv) \ + $(wildcard levels/misc/*.stl) \ + $(wildcard levels/*/*.stl) \ $(wildcard music/*.mod) \ $(wildcard music/*.MOD) \ $(wildcard sounds/*.wav) \ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:16:13
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5318 Modified Files: supertux.strf Log Message: - fixed some align problems Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- supertux.strf 25 Apr 2004 16:46:54 -0000 1.21 +++ supertux.strf 25 Apr 2004 17:17:10 -0000 1.22 @@ -29,33 +29,35 @@ ;; Small Tux Stand (sprite (name "smalltux-stand-left") (fps 15.0) - (x-hotspot 0) + (x-hotspot 5) (y-hotspot 9) (images "shared/smalltux-left-6.png" )) (sprite (name "smalltux-stand-right") (fps 15.0) - (x-hotspot 0) + (x-hotspot 5) (y-hotspot 9) (images "shared/smalltux-right-6.png")) ;; Small Tux Jump (sprite (name "smalltux-jump-left") (fps 15.0) - (x-hotspot 0) - (y-hotspot 0) + (x-hotspot 5) + (y-hotspot 7) (images "shared/smalltux-jump-left.png" )) (sprite (name "smalltux-jump-right") (fps 15.0) - (x-hotspot 0) - (y-hotspot 0) + (x-hotspot 5) + (y-hotspot 7) (images "shared/smalltux-jump-right.png")) (sprite (name "smalltux-gameover") (fps 10.0) + (x-hotspot 13) + (y-hotspot 6) (images "shared/smalltux-gameover-0.png" "shared/smalltux-gameover-1.png")) |
248 messages has been excluded from this view by a project administrator.
