super-tux-commit Mailing List for Super Tux (Page 31)
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: Ricardo C. <rm...@us...> - 2004-09-18 12:13:18
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9487/src Modified Files: title.cpp worldmap.cpp Log Message: Contrib worldmaps are now being saved. TODO: a slot based saving might be neat. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- title.cpp 17 Sep 2004 18:55:03 -0000 1.118 +++ title.cpp 18 Sep 2004 12:13:09 -0000 1.119 @@ -189,8 +189,20 @@ std::set<std::string>::iterator it = worldmap_list.begin(); for(int i = index - contrib_subsets.size(); i > 0; --i) ++it; - worldmap.loadmap((*it)); - worldmap.display(); + + std::string map_filename = *it; + + worldmap.loadmap(map_filename); + + // hack to erase the extension + unsigned int ext_pos = it->find_last_of("."); + if(ext_pos != std::string::npos) + map_filename.erase(ext_pos, map_filename.size() - ext_pos); + + // TODO: slots should be available for contrib maps + worldmap.loadgame(st_save_dir + "/" + map_filename + "-slot1.stsg"); + + worldmap.display(); // run the map Menu::set_current(main_menu); } Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- worldmap.cpp 17 Sep 2004 18:56:06 -0000 1.120 +++ worldmap.cpp 18 Sep 2004 12:13:09 -0000 1.121 @@ -1254,7 +1254,6 @@ { std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; - map_filename = "icyisland.stwm"; if (access(filename.c_str(), F_OK) != 0) { @@ -1282,8 +1281,10 @@ LispReader reader(cur); /* Get the Map filename and then load it before setting special_tile settings */ + std::string cur_map_filename = map_filename; reader.read_string("map", map_filename); - load_map(); + if(cur_map_filename != map_filename) + load_map(); reader.read_int("lives", player_status.lives); reader.read_int("distros", player_status.distros); |
|
From: Marek M. <wa...@us...> - 2004-09-17 23:14:34
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12237/src Modified Files: player.cpp player.h Log Message: fixed problems with the flapping key not responding you can now also use flapping after just walking into a gap without jumping Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.172 retrieving revision 1.173 diff -u -d -r1.172 -r1.173 --- player.cpp 17 Sep 2004 12:22:40 -0000 1.172 +++ player.cpp 17 Sep 2004 23:14:23 -0000 1.173 @@ -161,6 +161,7 @@ flapping = false; can_jump = true; can_flap = false; + falling_from_flap = false; enable_hover = false; butt_jump = false; @@ -318,6 +319,7 @@ physic.set_velocity_y(0); jumped_in_solid = true; jumping = false; + flapping = false; } } else @@ -377,6 +379,7 @@ { /* Make sure jumping is off. */ jumping = false; + flapping = false; } } } @@ -508,6 +511,7 @@ void Player::handle_vertical_input() { + // set fall mode... if(on_ground()) { fall_mode = ON_GROUND; @@ -543,21 +547,28 @@ SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP)); } // Let go of jump key - else if(input.up == UP && jumping && physic.get_velocity_y() > 0) + else if(input.up == UP) { - if (!flapping && !duck) + if (!flapping && !duck && !falling_from_flap && !on_ground()) { can_flap = true; } - jumping = false; - physic.set_velocity_y(0); + if (jumping && physic.get_velocity_y() > 0) + { + jumping = false; + physic.set_velocity_y(0); + } } - + // Flapping if (input.up == DOWN && can_flap) { if (!flapping_timer.started()) {flapping_timer.start(TUX_FLAPPING_TIME);} - if (!flapping_timer.check()) {can_flap = false;} + if (!flapping_timer.check()) + { + can_flap = false; + falling_from_flap = true; + } jumping = true; flapping = true; if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME) @@ -636,7 +647,11 @@ } if(on_ground()) /* Make sure jumping is off. */ - jumping = false; + { + jumping = false; + flapping = false; + falling_from_flap = false; + } input.old_up = input.up; } Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- player.h 16 Sep 2004 23:26:26 -0000 1.87 +++ player.h 17 Sep 2004 23:14:23 -0000 1.88 @@ -151,6 +151,7 @@ bool flapping; bool can_jump; bool can_flap; + bool falling_from_flap; bool enable_hover; bool butt_jump; int frame_; |
|
From: Ricardo C. <rm...@us...> - 2004-09-17 19:04:14
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31659/src Modified Files: statistics.cpp Log Message: Ooops. Mistake. Index: statistics.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- statistics.cpp 17 Sep 2004 18:56:06 -0000 1.9 +++ statistics.cpp 17 Sep 2004 19:04:04 -0000 1.10 @@ -232,7 +232,7 @@ { for(int i = 0; i < NUM_STATS; i++) { - if(stats_.stats[i][STOTAL] == -1) + if(stats_.stats[i][SPLAYER] == -1) continue; stats[i][SPLAYER] += stats_.stats[i][SPLAYER]; if(stats_.stats[i][STOTAL] != -1) |
|
From: Ricardo C. <rm...@us...> - 2004-09-17 18:56:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29769/src Modified Files: statistics.cpp worldmap.cpp Log Message: Fixed Score = -1 on worldmap display when no level has been played in a fresh slot. Index: statistics.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- statistics.cpp 17 Sep 2004 12:53:24 -0000 1.8 +++ statistics.cpp 17 Sep 2004 18:56:06 -0000 1.9 @@ -232,6 +232,8 @@ { for(int i = 0; i < NUM_STATS; i++) { + if(stats_.stats[i][STOTAL] == -1) + continue; stats[i][SPLAYER] += stats_.stats[i][SPLAYER]; if(stats_.stats[i][STOTAL] != -1) stats[i][STOTAL] += stats_.stats[i][STOTAL]; Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- worldmap.cpp 16 Sep 2004 15:04:18 -0000 1.119 +++ worldmap.cpp 17 Sep 2004 18:56:06 -0000 1.120 @@ -448,6 +448,8 @@ name = "<no title>"; music = "SALCON.MOD"; + + total_stats.reset(); } WorldMap::~WorldMap() |
|
From: Ricardo C. <rm...@us...> - 2004-09-17 18:55:13
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29538/src Modified Files: title.cpp Log Message: Fixed levels on contribs menu. Fixed warpping when Tux gets end of level on the demo background in title. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- title.cpp 16 Sep 2004 15:04:17 -0000 1.117 +++ title.cpp 17 Sep 2004 18:55:03 -0000 1.118 @@ -59,6 +59,7 @@ #include "special/base.h" #include "app/gettext.h" #include "misc.h" +#include "camera.h" static Surface* bkg_title; static Surface* logo; @@ -102,7 +103,6 @@ void generate_contrib_menu() { - /** Generating contrib levels list by making use of Level Subset */ std::set<std::string> level_subsets = FileSystem::dsubdirs("/levels", "info"); @@ -110,24 +110,22 @@ contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0); contrib_menu->additem(MN_HL,"",0,0); - int i = 0; for (std::set<std::string>::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) { LevelSubset* subset = new LevelSubset(); subset->load((*it).c_str()); - contrib_menu->additem(MN_GOTO, subset->title.c_str(), i, - contrib_subset_menu); + contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i); contrib_subsets.push_back(subset); ++i; } - i = 0; + i = level_subsets.size(); for(std::set<std::string>::iterator it = worldmap_list.begin(); it != worldmap_list.end(); ++it) { WorldMapNS::WorldMap worldmap; worldmap.loadmap((*it).c_str()); - contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.size()); + contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i); ++i; } @@ -152,14 +150,14 @@ current_subset = index; // FIXME: This shouln't be busy looping LevelSubset& subset = * (contrib_subsets[index]); - + current_contrib_subset = ⊂ contrib_subset_menu->clear(); contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0); contrib_subset_menu->additem(MN_HL,"",0,0); - + for (int i = 0; i < subset.get_num_levels(); ++i) { /** get level's title */ @@ -245,6 +243,7 @@ if(world->solids->get_width() * 32 - 320 < tux->base.x) { tux->level_begin(); + world->camera->reset(Vector(tux->base.x, tux->base.y)); } tux->can_jump = true; |
|
From: Ricardo C. <rm...@us...> - 2004-09-17 15:52:04
|
Update of /cvsroot/super-tux/supertux/data/levels/contribs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24293/data/levels/contribs Log Message: Directory /cvsroot/super-tux/supertux/data/levels/contribs added to the repository |
|
From: Ricardo C. <rm...@us...> - 2004-09-17 12:53:34
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19747/src Modified Files: statistics.cpp Log Message: Fixed when of the warning that appear to Frank. Couldn't fix the other since I don't know where it is, cause I've changed code in the meanwhile. Index: statistics.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- statistics.cpp 17 Sep 2004 12:22:40 -0000 1.7 +++ statistics.cpp 17 Sep 2004 12:53:24 -0000 1.8 @@ -41,6 +41,7 @@ case TIME_NEEDED_STAT: return "time-needed";; } + return ""; } int |
|
From: Ricardo C. <rm...@us...> - 2004-09-17 12:42:05
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16817/src Modified Files: gameobjs.cpp gameobjs.h Log Message: Remove particles when they get off the screen. Let time_left be defined for 0 to let particles alive until they get off the screen. Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- gameobjs.cpp 16 Sep 2004 15:04:17 -0000 1.50 +++ gameobjs.cpp 17 Sep 2004 12:41:50 -0000 1.51 @@ -33,6 +33,7 @@ #include "sector.h" #include "tilemap.h" #include "video/drawing_context.h" +#include "camera.h" BouncyDistro::BouncyDistro(const Vector& pos) : position(pos) @@ -441,7 +442,15 @@ Particles::Particles(const Vector& epicenter, const Vector& velocity, const Vector& acceleration, int number, Color color_, int size_, int life_time) : color(color_), size(size_), vel(velocity), accel(acceleration) { - timer.start(life_time); + if(life_time == 0) + { + live_forever = true; + } + else + { + live_forever = false; + timer.start(life_time); + } // create particles for(int p = 0; p < number; p++) @@ -467,14 +476,24 @@ vel.x += accel.x * elapsed_time; vel.y += accel.y * elapsed_time; + int camera_x = (int)Sector::current()->camera->get_translation().x; + int camera_y = (int)Sector::current()->camera->get_translation().y; + // update particles - for(int p = 0; p < particles.size(); p++) + for(std::vector<Particle*>::iterator i = particles.begin(); i < particles.end(); i++) { - particles[p]->pos.x += sin(particles[p]->angle) * vel.x * elapsed_time; - particles[p]->pos.y += cos(particles[p]->angle) * vel.y * elapsed_time; + (*i)->pos.x += sin((*i)->angle) * vel.x * elapsed_time; + (*i)->pos.y += cos((*i)->angle) * vel.y * elapsed_time; + + if((*i)->pos.x < camera_x || (*i)->pos.x > screen->w + camera_x || + (*i)->pos.y < camera_y || (*i)->pos.y > screen->h + camera_y) + { + delete (*i); + particles.erase(i); + } } - if(!timer.check()) + if((!timer.check() && !live_forever) || particles.size() == 0) remove_me(); } @@ -482,9 +501,9 @@ Particles::draw(DrawingContext& context) { // draw particles - for(int p = 0; p < particles.size(); p++) + for(std::vector<Particle*>::iterator i = particles.begin(); i < particles.end(); i++) { - context.draw_filled_rect(particles[p]->pos, Vector(size,size), color, LAYER_OBJECTS+10); + context.draw_filled_rect((*i)->pos, Vector(size,size), color, LAYER_OBJECTS+10); } } Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- gameobjs.h 14 Sep 2004 10:27:05 -0000 1.35 +++ gameobjs.h 17 Sep 2004 12:41:52 -0000 1.36 @@ -190,6 +190,7 @@ float size; Vector vel, accel; Timer timer; + bool live_forever; struct Particle { Vector pos; |
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12806/src Modified Files: badguy.cpp gameloop.cpp level.cpp level.h player.cpp sector.cpp sector.h statistics.cpp statistics.h Log Message: Added Total to statistics. Changes stuff that keeps track. Bug: percentage on draw_message_info() ain't working well. Index: statistics.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- statistics.cpp 16 Sep 2004 18:16:16 -0000 1.6 +++ statistics.cpp 17 Sep 2004 12:22:40 -0000 1.7 @@ -34,14 +34,12 @@ { case SCORE_STAT: return "score"; - case BADGUYS_SQUISHED_STAT: - return "badguys-squished"; - case SHOTS_STAT: - return "shots"; + case COINS_COLLECTED_STAT: + return "coins-collected"; + case BADGUYS_KILLED_STAT: + return "badguys-killed"; case TIME_NEEDED_STAT: - return "time-needed"; - case JUMPS_STAT: - return "jumps"; + return "time-needed";; } } @@ -61,7 +59,8 @@ display_stat = 1; for(int i = 0; i < NUM_STATS; i++) - stats[i] = -1; + for(int j = 0; j < 2; j++) + stats[i][j] = -1; } Statistics::~Statistics() @@ -72,26 +71,32 @@ Statistics::parse(LispReader& reader) { for(int i = 0; i < NUM_STATS; i++) - reader.read_int(stat_name_to_string(i).c_str(), stats[i]); + { + reader.read_int(stat_name_to_string(i).c_str(), stats[i][SPLAYER]); + reader.read_int((stat_name_to_string(i) + "-total").c_str(), stats[i][STOTAL]); + } } void Statistics::write(LispWriter& writer) { for(int i = 0; i < NUM_STATS; i++) - writer.write_int(stat_name_to_string(i), stats[i]); + { + writer.write_int(stat_name_to_string(i), stats[i][SPLAYER]); + writer.write_int(stat_name_to_string(i) + "-total", stats[i][STOTAL]); + } } #define TOTAL_DISPLAY_TIME 3400 #define FADING_TIME 600 -#define WMAP_INFO_LEFT_X 555 -#define WMAP_INFO_RIGHT_X 705 +#define WMAP_INFO_LEFT_X 540 +#define WMAP_INFO_RIGHT_X 720 void Statistics::draw_worldmap_info(DrawingContext& context) { - if(stats[SCORE_STAT] == -1) // not initialized yet + if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet return; if(!timer.check()) @@ -112,37 +117,36 @@ char str[128]; - context.draw_text(white_small_text, _("Level Statistics"), + context.draw_text(white_small_text, _("Best Level Statistics"), Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 490), CENTER_ALLIGN, LAYER_GUI); sprintf(str, _("Max score:")); context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 506), LEFT_ALLIGN, LAYER_GUI); - sprintf(str, "%d", stats[SCORE_STAT]); + sprintf(str, "%d", stats[SCORE_STAT][SPLAYER]); context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 506), RIGHT_ALLIGN, LAYER_GUI); // draw other small info - if(display_stat == BADGUYS_SQUISHED_STAT) + if(display_stat == COINS_COLLECTED_STAT) + sprintf(str, _("Max coins collected:")); + else if(display_stat == BADGUYS_KILLED_STAT) sprintf(str, _("Max fragging:")); - else if(display_stat == SHOTS_STAT) - sprintf(str, _("Min shots:")); - else if(display_stat == TIME_NEEDED_STAT) + else// if(display_stat == TIME_NEEDED_STAT) sprintf(str, _("Min time needed:")); - else// if(display_stat == JUMPS_STAT) - sprintf(str, _("Min jumps:")); context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 522), LEFT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha); - if(display_stat == BADGUYS_SQUISHED_STAT) - sprintf(str, "%d", stats[BADGUYS_SQUISHED_STAT]); - else if(display_stat == SHOTS_STAT) - sprintf(str, "%d", stats[SHOTS_STAT]); - else if(display_stat == TIME_NEEDED_STAT) - sprintf(str, "%d", stats[TIME_NEEDED_STAT]); - else// if(display_stat == JUMPS_STAT) - sprintf(str, "%d", stats[JUMPS_STAT]); + if(display_stat == COINS_COLLECTED_STAT) + sprintf(str, "%d/%d", stats[COINS_COLLECTED_STAT][SPLAYER], + stats[COINS_COLLECTED_STAT][STOTAL]); + else if(display_stat == BADGUYS_KILLED_STAT) + sprintf(str, "%d/%d", stats[BADGUYS_KILLED_STAT][SPLAYER], + stats[BADGUYS_KILLED_STAT][STOTAL]); + else// if(display_stat == TIME_NEEDED_STAT) + sprintf(str, "%d/%d", stats[TIME_NEEDED_STAT][SPLAYER], + stats[TIME_NEEDED_STAT][STOTAL]); context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 522), RIGHT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha); } @@ -150,26 +154,27 @@ void Statistics::draw_message_info(DrawingContext& context, std::string title) { - if(stats[SCORE_STAT] == -1) // not initialized yet + if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet return; context.draw_text(gold_text, title, Vector(screen->w/2, 410), CENTER_ALLIGN, LAYER_GUI); char str[128]; - sprintf(str, _( "Max score: %d"), stats[SCORE_STAT]); + sprintf(str, _( "Max score: %d"), stats[SCORE_STAT][SPLAYER]); context.draw_text(white_text, str, Vector(screen->w/2, 450), CENTER_ALLIGN, LAYER_GUI); for(int i = 1; i < NUM_STATS; i++) { - if(i == BADGUYS_SQUISHED_STAT) - sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]); - else if(i == SHOTS_STAT) - sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]); - else if(i == TIME_NEEDED_STAT) - sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]); - else// if(i == JUMPS_STAT) - sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]); + if(i == COINS_COLLECTED_STAT) + sprintf(str, _("Max coins collected: %d"), ((float)stats[COINS_COLLECTED_STAT][SPLAYER] / + (float)stats[COINS_COLLECTED_STAT][STOTAL]) * 100); + else if(i == BADGUYS_KILLED_STAT) + sprintf(str, _("Max fragging: %d"), ((float)stats[BADGUYS_KILLED_STAT][SPLAYER] / + (float)stats[BADGUYS_KILLED_STAT][STOTAL]) * 100); + else// if(i == TIME_NEEDED_STAT) + sprintf(str, _("Min time needed: %d"), ((float)stats[TIME_NEEDED_STAT][SPLAYER] / + (float)stats[TIME_NEEDED_STAT][STOTAL]) * 100); context.draw_text(white_small_text, str, Vector(screen->w/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI); } @@ -178,44 +183,56 @@ void Statistics::add_points(int stat, int points) { - stats[stat] += points; + stats[stat][SPLAYER] += points; } int Statistics::get_points(int stat) { - return stats[stat]; + return stats[stat][SPLAYER]; } void Statistics::set_points(int stat, int points) { - stats[stat] = points; + stats[stat][SPLAYER] = points; +} + +void +Statistics::set_total_points(int stat, int points) +{ + stats[stat][STOTAL] = points; } void Statistics::reset() { for(int i = 0; i < NUM_STATS; i++) - stats[i] = 0; + stats[i][SPLAYER] = 0; } void Statistics::merge(Statistics& stats_) { - stats[SCORE_STAT] = std::max(stats[SCORE_STAT], stats_.stats[SCORE_STAT]); - if(stats[JUMPS_STAT] != -1) - stats[JUMPS_STAT] = my_min(stats[JUMPS_STAT], stats_.stats[JUMPS_STAT]); - stats[BADGUYS_SQUISHED_STAT] = - std::max(stats[BADGUYS_SQUISHED_STAT], stats_.stats[BADGUYS_SQUISHED_STAT]); - stats[SHOTS_STAT] = my_min(stats[SHOTS_STAT], stats_.stats[SHOTS_STAT]); - stats[TIME_NEEDED_STAT] = - my_min(stats[TIME_NEEDED_STAT], stats_.stats[TIME_NEEDED_STAT]); + stats[SCORE_STAT][SPLAYER] = std::max(stats[SCORE_STAT][SPLAYER], stats_.stats[SCORE_STAT][SPLAYER]); + stats[COINS_COLLECTED_STAT][SPLAYER] = std::max(stats[COINS_COLLECTED_STAT][SPLAYER], stats_.stats[COINS_COLLECTED_STAT][SPLAYER]); + stats[BADGUYS_KILLED_STAT][SPLAYER] = + std::max(stats[BADGUYS_KILLED_STAT][SPLAYER], stats_.stats[BADGUYS_KILLED_STAT][SPLAYER]); + stats[TIME_NEEDED_STAT][SPLAYER] = + my_min(stats[TIME_NEEDED_STAT][SPLAYER], stats_.stats[TIME_NEEDED_STAT][SPLAYER]); + + stats[COINS_COLLECTED_STAT][STOTAL] = stats_.stats[COINS_COLLECTED_STAT][STOTAL]; + stats[BADGUYS_KILLED_STAT][STOTAL] = stats_.stats[BADGUYS_KILLED_STAT][STOTAL]; + stats[TIME_NEEDED_STAT][STOTAL] = stats_.stats[TIME_NEEDED_STAT][STOTAL]; } void Statistics::operator+=(const Statistics& stats_) { for(int i = 0; i < NUM_STATS; i++) - stats[i] += stats_.stats[i]; + { + stats[i][SPLAYER] += stats_.stats[i][SPLAYER]; + if(stats_.stats[i][STOTAL] != -1) + stats[i][STOTAL] += stats_.stats[i][STOTAL]; + } } Index: sector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- sector.h 16 Sep 2004 18:56:09 -0000 1.14 +++ sector.h 17 Sep 2004 12:22:40 -0000 1.15 @@ -139,6 +139,9 @@ static Sector* current() { return _current; } + /** Get total number of some stuff */ + int get_total_badguys(); + private: void load_music(); Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- sector.cpp 16 Sep 2004 18:56:09 -0000 1.27 +++ sector.cpp 17 Sep 2004 12:22:40 -0000 1.28 @@ -736,7 +736,6 @@ throw std::runtime_error("wrong bullet type."); add_object(new_bullet); - global_stats.add_points(SHOTS_STAT, 1); SoundManager::get()->play_sound(IDToSound(SND_SHOOT)); return true; @@ -795,6 +794,7 @@ SoundManager::get()->play_sound(IDToSound(SND_DISTRO)); global_stats.add_points(SCORE_STAT, SCORE_DISTRO); + global_stats.add_points(COINS_COLLECTED_STAT, 1); player_status.distros++; return true; } @@ -849,6 +849,7 @@ add_bouncy_distro(Vector(posx, posy)); SoundManager::get()->play_sound(IDToSound(SND_DISTRO)); global_stats.add_points(SCORE_STAT, SCORE_DISTRO); + global_stats.add_points(COINS_COLLECTED_STAT, 1); player_status.distros++; break; @@ -906,7 +907,7 @@ solids->change_at(pos, tile->next_tile); SoundManager::get()->play_sound(IDToSound(SND_DISTRO)); - + if (bounciness == BOUNCE) { add_bouncy_distro(Vector(((int)(pos.x + 1) / 32) * 32, @@ -914,6 +915,7 @@ } global_stats.add_points(SCORE_STAT, SCORE_DISTRO); + global_stats.add_points(COINS_COLLECTED_STAT, 1); player_status.distros++; } @@ -992,3 +994,16 @@ { return currentmusic; } + +int +Sector::get_total_badguys() +{ + int total_badguys = 0; + for(GameObjects::iterator i = gameobjects_new.begin(); i != gameobjects_new.end(); ++i) + { + BadGuy* badguy = dynamic_cast<BadGuy*> (*i); + if(badguy) + total_badguys++; + } + return total_badguys; +} Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- level.h 21 Jul 2004 16:51:53 -0000 1.62 +++ level.h 17 Sep 2004 12:22:40 -0000 1.63 @@ -61,6 +61,9 @@ Sector* get_sector(const std::string& name); + int get_total_badguys(); + int get_total_coins(); + private: void load_old_format(LispReader& reader); }; Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.171 retrieving revision 1.172 diff -u -d -r1.171 -r1.172 --- player.cpp 16 Sep 2004 23:26:26 -0000 1.171 +++ player.cpp 17 Sep 2004 12:22:40 -0000 1.172 @@ -522,8 +522,6 @@ // Press jump key if(input.up == DOWN && can_jump && on_ground()) { - global_stats.add_points(JUMPS_STAT, 1); - if(duck) { // only jump a little bit when in duck mode { physic.set_velocity_y(3); } else { Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- badguy.cpp 15 Sep 2004 11:50:31 -0000 1.123 +++ badguy.cpp 17 Sep 2004 12:22:39 -0000 1.124 @@ -1072,7 +1072,6 @@ 25 * player_status.score_multiplier); SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos()); - global_stats.add_points(BADGUYS_SQUISHED_STAT, 1); player_status.score_multiplier++; return; @@ -1125,7 +1124,6 @@ Sector::current()->add_score(Vector(base.x, base.y), 25 * player_status.score_multiplier); - global_stats.add_points(BADGUYS_SQUISHED_STAT, 1); player_status.score_multiplier++; // simply remove the fish... @@ -1162,7 +1160,6 @@ player->bounce(this); base.y += 66 - base.height; - global_stats.add_points(BADGUYS_SQUISHED_STAT, 1); Sector::current()->add_score(Vector(base.x, base.y), 25 * player_status.score_multiplier); player_status.score_multiplier++; @@ -1180,6 +1177,9 @@ if(kind == BAD_BOMB) return; + if(mode != HELD) + global_stats.add_points(BADGUYS_KILLED_STAT, 1); + dying = DYING_FALLING; if(kind == BAD_MRICEBLOCK) { set_sprite(img_mriceblock_falling_left, img_mriceblock_falling_right); Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- level.cpp 14 Sep 2004 22:26:22 -0000 1.100 +++ level.cpp 17 Sep 2004 12:22:40 -0000 1.101 @@ -39,6 +39,7 @@ #include "resources.h" #include "gameobjs.h" #include "utils/lispwriter.h" +#include "tilemap.h" using namespace std; @@ -156,3 +157,24 @@ return i->second; } + +int +Level::get_total_badguys() +{ + int total_badguys = 0; + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) + total_badguys += i->second->get_total_badguys(); + return total_badguys; +} + +int +Level::get_total_coins() +{ + int total_coins = 0; + for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it) + for(int x = 0; x < it->second->solids->get_width(); x++) + for(int y = 0; y < it->second->solids->get_height(); y++) + if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN) + total_coins++; + return total_coins; +} Index: statistics.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- statistics.h 15 Sep 2004 21:59:30 -0000 1.4 +++ statistics.h 17 Sep 2004 12:22:40 -0000 1.5 @@ -30,12 +30,14 @@ class DrawingContext; } +#define SPLAYER 0 +#define STOTAL 1 + enum { SCORE_STAT, - BADGUYS_SQUISHED_STAT, - SHOTS_STAT, + COINS_COLLECTED_STAT, + BADGUYS_KILLED_STAT, TIME_NEEDED_STAT, - JUMPS_STAT, NUM_STATS }; @@ -46,6 +48,7 @@ class Statistics { public: + // don't forget to call reset() to init stat Statistics(); ~Statistics(); @@ -64,6 +67,8 @@ void set_points(int stat, int points); int get_points(int stat); + void set_total_points(int stat, int points); + /* Reset statistics */ void reset(); @@ -74,7 +79,7 @@ void operator+=(const Statistics& o); private: - int stats[NUM_STATS]; + int stats[NUM_STATS][2]; Timer timer; int display_stat; Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.184 retrieving revision 1.185 diff -u -d -r1.184 -r1.185 --- gameloop.cpp 17 Sep 2004 11:40:10 -0000 1.184 +++ gameloop.cpp 17 Sep 2004 12:22:40 -0000 1.185 @@ -129,6 +129,11 @@ if(flip_level) level->do_vertical_flip(); + global_stats.reset(); + global_stats.set_total_points(COINS_COLLECTED_STAT, level->get_total_coins()); + global_stats.set_total_points(BADGUYS_KILLED_STAT, level->get_total_badguys()); + global_stats.set_total_points(TIME_NEEDED_STAT, level->time_left); + currentsector = level->get_sector("main"); if(!currentsector) Termination::abort("Level has no main sector.", ""); @@ -152,8 +157,6 @@ levelintro(); } - global_stats.reset(); - time_left.init(true); start_timers(); currentsector->play_music(LEVEL_MUSIC); |
|
From: Marek M. <wa...@us...> - 2004-09-17 11:40:19
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4608/src Modified Files: gameloop.cpp Log Message: don't loose a life when using the "kill" cheat Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.183 retrieving revision 1.184 diff -u -d -r1.183 -r1.184 --- gameloop.cpp 16 Sep 2004 18:56:01 -0000 1.183 +++ gameloop.cpp 17 Sep 2004 11:40:10 -0000 1.184 @@ -436,7 +436,8 @@ last_keys.clear(); } if(compare_last(last_keys, "kill")) - { // kill Tux + { // kill Tux, but without losing a life + player_status.lives++; tux.kill(tux.KILL); last_keys.clear(); } |
|
From: Marek M. <wa...@us...> - 2004-09-17 11:29:14
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2376/data/levels/test Added Files: level14.stl Log Message: added a flapping test parcours, try it! --- NEW FILE: level14.stl --- ;; Generated by Flexlay Editor (supertux-level (version 1) (author "the time you went through this, you know how to flap :)") (name "Flapping Parcours - Don't touch grey blocks!") (width 220) (height 19) (start_pos_x 100) (start_pos_y 100) (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) (bkgd_red_bottom 150) (bkgd_green_bottom 200) (bkgd_blue_bottom 255) (time 500) (gravity 10) (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 27 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 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 28 29 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 27 28 28 28 28 28 28 29 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 31 11 11 30 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 28 28 28 29 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 31 30 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 16 18 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 7 8 133 8 8 8 8 8 8 8 8 8 8 8 8 8 8 132 132 8 8 8 8 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 27 29 0 0 0 0 0 0 0 61 0 0 0 0 7 8 114 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 12 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 47 0 0 27 29 61 61 61 61 61 61 61 61 0 0 0 0 13 14 23 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 12 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 47 0 0 0 0 0 0 0 0 0 0 47 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 47 0 0 27 29 0 0 0 0 0 0 0 0 0 0 0 0 10 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 12 76 76 76 76 76 76 79 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 47 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 47 0 0 27 29 0 0 0 0 0 0 0 0 0 0 0 0 10 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 12 75 75 75 75 75 75 79 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 47 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 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 12 75 75 75 75 75 75 79 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 47 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 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 12 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 47 27 28 28 28 28 28 28 28 28 28 28 28 28 28 29 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 61 61 61 61 61 61 61 61 61 61 61 61 61 61 10 11 11 11 11 11 11 11 11 11 11 11 11 12 61 61 61 61 61 61 61 61 61 61 61 61 61 61 10 11 11 11 11 11 11 11 11 11 11 11 11 12 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 10 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 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 12 75 75 75 75 75 75 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 12 61 61 61 61 27 28 28 28 28 28 28 28 28 28 29 61 61 61 61 61 61 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 129 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 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 136 137 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 138 139 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 76 0 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 129 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (reset-points ) (objects ) ) ;; EOF ;; |
|
From: Marek M. <wa...@us...> - 2004-09-16 23:26:35
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31225/src Modified Files: player.cpp player.h Log Message: replaced double jumping with flapping Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.170 retrieving revision 1.171 diff -u -d -r1.170 -r1.171 --- player.cpp 16 Sep 2004 20:58:41 -0000 1.170 +++ player.cpp 16 Sep 2004 23:26:26 -0000 1.171 @@ -158,9 +158,9 @@ last_ground_y = 0; fall_mode = ON_GROUND; jumping = false; - double_jumping = false; + flapping = false; can_jump = true; - can_double_jump = false; + can_flap = false; enable_hover = false; butt_jump = false; @@ -177,6 +177,7 @@ shooting_timer.init(true); growing_timer.init(true); idle_timer.init(true); + flapping_timer.init(true); physic.reset(); } @@ -535,9 +536,9 @@ --base.y; jumping = true; - double_jumping = false; + flapping = false; can_jump = false; - can_double_jump = false; + can_flap = false; if (size == SMALL) SoundManager::get()->play_sound(IDToSound(SND_JUMP)); else @@ -546,22 +547,25 @@ // Let go of jump key else if(input.up == UP && jumping && physic.get_velocity_y() > 0) { - if (!double_jumping && !duck) {can_double_jump = true;} + if (!flapping && !duck) + { + can_flap = true; + } jumping = false; physic.set_velocity_y(0); } - // Double jump - if (input.up == DOWN && can_double_jump) + // Flapping + if (input.up == DOWN && can_flap) { - can_double_jump = false; + if (!flapping_timer.started()) {flapping_timer.start(TUX_FLAPPING_TIME);} + if (!flapping_timer.check()) {can_flap = false;} jumping = true; - double_jumping = true; - if (size == SMALL) - SoundManager::get()->play_sound(IDToSound(SND_JUMP)); - else - SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP)); - physic.set_velocity_y(5.2); + flapping = true; + if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME) + { + physic.set_velocity_y((float)flapping_timer.get_gone()/450); + } } // Hover Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- player.h 15 Sep 2004 22:39:24 -0000 1.86 +++ player.h 16 Sep 2004 23:26:26 -0000 1.87 @@ -40,6 +40,7 @@ #define TUX_SAFE_TIME 1250 #define TUX_INVINCIBLE_TIME 10000 #define TUX_INVINCIBLE_TIME_WARNING 2000 +#define TUX_FLAPPING_TIME 1000 /* How long Tux can flap his wings to gain additional jump height */ #define TIME_WARNING 20000 /* When to alert player they're low on time! */ /* One-ups... */ @@ -147,9 +148,9 @@ FallMode fall_mode; bool jumping; - bool double_jumping; + bool flapping; bool can_jump; - bool can_double_jump; + bool can_flap; bool enable_hover; bool butt_jump; int frame_; @@ -165,6 +166,7 @@ Timer dying_timer; Timer growing_timer; Timer idle_timer; + Timer flapping_timer; Physic physic; public: |
|
From: Marek M. <wa...@us...> - 2004-09-16 20:58:53
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31708/src Modified Files: player.cpp Log Message: just changed tabs for spaces :) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- player.cpp 16 Sep 2004 20:48:09 -0000 1.169 +++ player.cpp 16 Sep 2004 20:58:41 -0000 1.170 @@ -535,9 +535,9 @@ --base.y; jumping = true; - double_jumping = false; + double_jumping = false; can_jump = false; - can_double_jump = false; + can_double_jump = false; if (size == SMALL) SoundManager::get()->play_sound(IDToSound(SND_JUMP)); else @@ -547,30 +547,30 @@ else if(input.up == UP && jumping && physic.get_velocity_y() > 0) { if (!double_jumping && !duck) {can_double_jump = true;} - jumping = false; + jumping = false; physic.set_velocity_y(0); } - - // Double jump - if (input.up == DOWN && can_double_jump) - { - can_double_jump = false; - jumping = true; - double_jumping = true; - if (size == SMALL) + + // Double jump + if (input.up == DOWN && can_double_jump) + { + can_double_jump = false; + jumping = true; + double_jumping = true; + if (size == SMALL) SoundManager::get()->play_sound(IDToSound(SND_JUMP)); else SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP)); - physic.set_velocity_y(5.2); - } - - // Hover + physic.set_velocity_y(5.2); + } + + // Hover //(disabled by default, use cheat code "hover" to toggle on/off) - //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys - if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0) - { - physic.set_velocity_y(-1); - } + //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys + if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0) + { + physic.set_velocity_y(-1); + } /* In case the player has pressed Down while in a certain range of air, enable butt jump action */ |
|
From: Marek M. <wa...@us...> - 2004-09-16 20:48:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30079/src Modified Files: player.cpp Log Message: play jump sound again when double jumping (the double jump should probably get an extra sound effect) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.168 retrieving revision 1.169 diff -u -d -r1.168 -r1.169 --- player.cpp 15 Sep 2004 22:39:23 -0000 1.168 +++ player.cpp 16 Sep 2004 20:48:09 -0000 1.169 @@ -557,6 +557,10 @@ can_double_jump = false; jumping = true; double_jumping = true; + if (size == SMALL) + SoundManager::get()->play_sound(IDToSound(SND_JUMP)); + else + SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP)); physic.set_velocity_y(5.2); } |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 18:59:20
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7842/data/levels/world1 Modified Files: level10.stl level11.stl level12.stl level13.stl level1.stl level23.stl level24.stl level25.stl level2.stl level3.stl level4.stl level5.stl level6.stl level7.stl level8.stl level9.stl Log Message: Setup-ed fire works for open air levels. Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level1.stl 15 Jul 2004 19:47:33 -0000 1.19 +++ level1.stl 16 Sep 2004 18:59:04 -0000 1.20 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level12.stl 8 Aug 2004 09:42:50 -0000 1.17 +++ level12.stl 16 Sep 2004 18:59:03 -0000 1.18 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 100) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "snow") (theme "antarctica") (interactive-tm Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level5.stl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- level5.stl 16 Aug 2004 17:02:52 -0000 1.23 +++ level5.stl 16 Sep 2004 18:59:05 -0000 1.24 @@ -17,6 +17,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10.0) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- level4.stl 15 Jul 2004 19:47:33 -0000 1.21 +++ level4.stl 16 Sep 2004 18:59:05 -0000 1.22 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level6.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level6.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level6.stl 15 Jul 2004 19:47:33 -0000 1.16 +++ level6.stl 16 Sep 2004 18:59:05 -0000 1.17 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level8.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level8.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level8.stl 15 Jul 2004 19:47:33 -0000 1.18 +++ level8.stl 16 Sep 2004 18:59:06 -0000 1.19 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level7.stl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- level7.stl 15 Jul 2004 19:47:33 -0000 1.21 +++ level7.stl 16 Sep 2004 18:59:06 -0000 1.22 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "snow") (theme "antarctica") (interactive-tm Index: level25.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level25.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level25.stl 16 Aug 2004 17:02:52 -0000 1.9 +++ level25.stl 16 Sep 2004 18:59:04 -0000 1.10 @@ -17,6 +17,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level24.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level24.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level24.stl 17 Aug 2004 09:54:23 -0000 1.16 +++ level24.stl 16 Sep 2004 18:59:04 -0000 1.17 @@ -17,6 +17,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level23.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level23.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level23.stl 15 Jul 2004 16:30:47 -0000 1.13 +++ level23.stl 16 Sep 2004 18:59:04 -0000 1.14 @@ -17,6 +17,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10.0) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level13.stl 14 Sep 2004 19:07:30 -0000 1.19 +++ level13.stl 16 Sep 2004 18:59:03 -0000 1.20 @@ -17,6 +17,7 @@ (bkgd_blue_bottom 255) (time 200) (gravity 10.0) + (end-sequence-animation "fireworks") (particle_system "clouds") (theme "antarctica") (interactive-tm Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level11.stl 15 Jul 2004 19:47:32 -0000 1.19 +++ level11.stl 16 Sep 2004 18:59:03 -0000 1.20 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 100) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "snow") (theme "antarctica") (interactive-tm Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level2.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level2.stl 15 Jul 2004 19:47:33 -0000 1.17 +++ level2.stl 16 Sep 2004 18:59:04 -0000 1.18 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level9.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level9.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level9.stl 15 Jul 2004 19:47:33 -0000 1.17 +++ level9.stl 16 Sep 2004 18:59:06 -0000 1.18 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "snow") (theme "antarctica") (interactive-tm Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level3.stl 5 Aug 2004 07:58:54 -0000 1.18 +++ level3.stl 16 Sep 2004 18:59:05 -0000 1.19 @@ -17,6 +17,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level10.stl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- level10.stl 15 Jul 2004 19:47:32 -0000 1.20 +++ level10.stl 16 Sep 2004 18:59:03 -0000 1.21 @@ -20,6 +20,7 @@ (bkgd_blue_bottom 150) (time 300) (gravity 10.0) + (end-sequence-animation "fireworks") (particle_system "") (theme "antarctica") (interactive-tm |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 18:56:45
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7679 Modified Files: LEVELDESIGN Log Message: Info about (end-sequence-animation "") Index: LEVELDESIGN =================================================================== RCS file: /cvsroot/super-tux/supertux/LEVELDESIGN,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- LEVELDESIGN 9 Jul 2004 10:58:41 -0000 1.10 +++ LEVELDESIGN 16 Sep 2004 18:56:36 -0000 1.11 @@ -41,6 +41,9 @@ ; Naming sectors is usefull to for swapping ; "main" sectors are the ones that the player will start in (name "main") +; Setup an end sequence animation (blank for nothing). +; Currently supported is fireworks that displays fireworks on exit. + (end-sequence-animation "fireworks") ; Level's gravity (better let it 10) (gravity 10) ; We can have one or more playerspawn that can be used by doors. |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 18:56:19
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7444/src Modified Files: gameloop.cpp sector.cpp sector.h Log Message: Added support for setting up end sequence animations on levels. Tag: (end-sequence-animation "fireworks") fireworks is only supported currently. Index: sector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- sector.h 14 Sep 2004 10:27:05 -0000 1.13 +++ sector.h 16 Sep 2004 18:56:09 -0000 1.14 @@ -56,6 +56,11 @@ Vector pos; }; +enum { + NONE_ENDSEQ_ANIM, + FIREWORKS_ENDSEQ_ANIM + }; + /** This class holds a sector (a part of a level) and all the game objects * (badguys, player, background, tilemap, ...) */ @@ -126,6 +131,10 @@ player to play the same level in a different way :) */ void do_vertical_flip(); + /** Get end sequence animation */ + int end_sequence_animation() + { return end_sequence_animation_type; } + /** @evil@ */ static Sector* current() { return _current; } @@ -140,6 +149,8 @@ MusicRef level_song; MusicRef level_song_fast; + int end_sequence_animation_type; + public: std::string song_title; float gravity; Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- sector.cpp 15 Sep 2004 11:50:31 -0000 1.26 +++ sector.cpp 16 Sep 2004 18:56:09 -0000 1.27 @@ -46,7 +46,7 @@ Sector::Sector() : gravity(10), player(0), solids(0), background(0), camera(0), - currentmusic(LEVEL_MUSIC) + currentmusic(LEVEL_MUSIC), end_sequence_animation_type(NONE_ENDSEQ_ANIM) { song_title = "Mortimers_chipdisko.mod"; player = new Player(); @@ -86,6 +86,10 @@ } else if(token == "music") { song_title = lisp_string(data); load_music(); + } else if(token == "end-sequence-animation") { + std::string end_seq_anim = lisp_string(data); + if(end_seq_anim == "fireworks") + end_sequence_animation_type = FIREWORKS_ENDSEQ_ANIM; } else if(token == "camera") { if(camera) { std::cerr << "Warning: More than 1 camera defined in sector.\n"; @@ -184,6 +188,13 @@ add_object(background); } + std::string end_seq_anim; + reader.read_string("end-sequence-animation", end_seq_anim); + if(end_seq_anim == "fireworks") + end_sequence_animation_type = FIREWORKS_ENDSEQ_ANIM; +// else +// end_sequence_animation = NONE_ENDSEQ_ANIM; + std::string particlesystem; reader.read_string("particle_system", particlesystem); if(particlesystem == "clouds") Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.182 retrieving revision 1.183 diff -u -d -r1.182 -r1.183 --- gameloop.cpp 16 Sep 2004 15:04:16 -0000 1.182 +++ gameloop.cpp 16 Sep 2004 18:56:01 -0000 1.183 @@ -548,14 +548,15 @@ else if(!end_sequence && endtile && endtile->data == 0) { end_sequence = ENDSEQUENCE_RUNNING; - random_timer.start(200); // start 1st firework + endsequence_timer.start(7000); // 5 seconds until we finish the map last_x_pos = -1; SoundManager::get()->play_music(level_end_song, 0); - endsequence_timer.start(7000); // 5 seconds until we finish the map tux->invincible_timer.start(7000); //FIXME: Implement a winning timer for the end sequence (with special winning animation etc.) // add left time to stats global_stats.set_points(TIME_NEEDED_STAT, time_left.get_gone() / 1000); + + random_timer.start(200); // start 1st firework } else if (!end_sequence && tux->is_dead()) { @@ -593,7 +594,8 @@ } // on end sequence make a few fireworks - if(end_sequence == ENDSEQUENCE_RUNNING && !random_timer.check()) + if(end_sequence == ENDSEQUENCE_RUNNING && !random_timer.check() && + currentsector->end_sequence_animation() == FIREWORKS_ENDSEQ_ANIM) { Vector epicenter = currentsector->camera->get_translation(); epicenter.x += screen->w * ((float)rand() / RAND_MAX); |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 18:16:36
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29832/src Modified Files: statistics.cpp Log Message: Improved layout of statistics displaying. Index: statistics.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- statistics.cpp 16 Sep 2004 15:04:17 -0000 1.5 +++ statistics.cpp 16 Sep 2004 18:16:16 -0000 1.6 @@ -85,6 +85,9 @@ #define TOTAL_DISPLAY_TIME 3400 #define FADING_TIME 600 +#define WMAP_INFO_LEFT_X 555 +#define WMAP_INFO_RIGHT_X 705 + void Statistics::draw_worldmap_info(DrawingContext& context) { @@ -109,21 +112,39 @@ char str[128]; - context.draw_text(white_small_text, _("Level Statistics"), Vector(550, 490), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, _("Level Statistics"), + Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 490), + CENTER_ALLIGN, LAYER_GUI); - sprintf(str, _("Max score: %d"), stats[SCORE_STAT]); - context.draw_text(white_small_text, str, Vector(560, 506), LEFT_ALLIGN, LAYER_GUI); + sprintf(str, _("Max score:")); + context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 506), LEFT_ALLIGN, LAYER_GUI); + + sprintf(str, "%d", stats[SCORE_STAT]); + context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 506), RIGHT_ALLIGN, LAYER_GUI); + + // draw other small info if(display_stat == BADGUYS_SQUISHED_STAT) - sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]); + sprintf(str, _("Max fragging:")); else if(display_stat == SHOTS_STAT) - sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]); + sprintf(str, _("Min shots:")); else if(display_stat == TIME_NEEDED_STAT) - sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]); + sprintf(str, _("Min time needed:")); else// if(display_stat == JUMPS_STAT) - sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]); + sprintf(str, _("Min jumps:")); - context.draw_text(white_small_text, str, Vector(560, 522), LAYER_GUI, LEFT_ALLIGN, NONE_EFFECT, alpha); + context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 522), LEFT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha); + + if(display_stat == BADGUYS_SQUISHED_STAT) + sprintf(str, "%d", stats[BADGUYS_SQUISHED_STAT]); + else if(display_stat == SHOTS_STAT) + sprintf(str, "%d", stats[SHOTS_STAT]); + else if(display_stat == TIME_NEEDED_STAT) + sprintf(str, "%d", stats[TIME_NEEDED_STAT]); + else// if(display_stat == JUMPS_STAT) + sprintf(str, "%d", stats[JUMPS_STAT]); + + context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 522), RIGHT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha); } void @@ -132,23 +153,25 @@ if(stats[SCORE_STAT] == -1) // not initialized yet return; - context.draw_text(gold_text, title, Vector(screen->w/2, 400), CENTER_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, title, Vector(screen->w/2, 410), CENTER_ALLIGN, LAYER_GUI); char str[128]; - for(int i = 0; i < NUM_STATS; i++) + + sprintf(str, _( "Max score: %d"), stats[SCORE_STAT]); + context.draw_text(white_text, str, Vector(screen->w/2, 450), CENTER_ALLIGN, LAYER_GUI); + + for(int i = 1; i < NUM_STATS; i++) { - if(i == SCORE_STAT) - sprintf(str, _("Max score: %d"), stats[SCORE_STAT]); - else if(i == BADGUYS_SQUISHED_STAT) - sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]); + if(i == BADGUYS_SQUISHED_STAT) + sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]); else if(i == SHOTS_STAT) - sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]); + sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]); else if(i == TIME_NEEDED_STAT) sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]); else// if(i == JUMPS_STAT) - sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]); + sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]); - context.draw_text(white_text, str, Vector(screen->w/2, 430 + i*22), CENTER_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, str, Vector(screen->w/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI); } } |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 15:04:28
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18913/src Modified Files: gameloop.cpp gameobjs.cpp high_scores.cpp leveleditor.cpp statistics.cpp title.cpp worldmap.cpp Log Message: Changed behavior of centered text drawing and added right allignment, as well. Added a new allignment argument for draw_text(). draw_text_center() is draw_text() with CENTER_ALLIGN in point Vector(screen->w/2, ...). Index: statistics.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/statistics.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- statistics.cpp 15 Sep 2004 21:59:30 -0000 1.4 +++ statistics.cpp 16 Sep 2004 15:04:17 -0000 1.5 @@ -22,6 +22,7 @@ #include "statistics.h" #include "video/drawing_context.h" #include "app/gettext.h" +#include "app/globals.h" #include "resources.h" Statistics global_stats; @@ -108,10 +109,10 @@ char str[128]; - context.draw_text(white_small_text, _("Level Statistics"), Vector(550, 490), LAYER_GUI); + context.draw_text(white_small_text, _("Level Statistics"), Vector(550, 490), LEFT_ALLIGN, LAYER_GUI); sprintf(str, _("Max score: %d"), stats[SCORE_STAT]); - context.draw_text(white_small_text, str, Vector(560, 506), LAYER_GUI); + context.draw_text(white_small_text, str, Vector(560, 506), LEFT_ALLIGN, LAYER_GUI); if(display_stat == BADGUYS_SQUISHED_STAT) sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]); @@ -122,7 +123,7 @@ else// if(display_stat == JUMPS_STAT) sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]); - context.draw_text(white_small_text, str, Vector(560, 522), LAYER_GUI, NONE_EFFECT, alpha); + context.draw_text(white_small_text, str, Vector(560, 522), LAYER_GUI, LEFT_ALLIGN, NONE_EFFECT, alpha); } void @@ -131,7 +132,7 @@ if(stats[SCORE_STAT] == -1) // not initialized yet return; - context.draw_text_center(gold_text, title, Vector(0, 400), LAYER_GUI); + context.draw_text(gold_text, title, Vector(screen->w/2, 400), CENTER_ALLIGN, LAYER_GUI); char str[128]; for(int i = 0; i < NUM_STATS; i++) @@ -147,7 +148,7 @@ else// if(i == JUMPS_STAT) sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]); - context.draw_text_center(white_text, str, Vector(0, 430 + i*22), LAYER_GUI); + context.draw_text(white_text, str, Vector(screen->w/2, 430 + i*22), CENTER_ALLIGN, LAYER_GUI); } } Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.149 retrieving revision 1.150 diff -u -d -r1.149 -r1.150 --- leveleditor.cpp 12 Aug 2004 22:05:23 -0000 1.149 +++ leveleditor.cpp 16 Sep 2004 15:04:17 -0000 1.150 @@ -827,20 +827,20 @@ } sprintf(str, "%d/%d", le_levelnb, le_level_subset->get_num_levels()); - context.draw_text(white_text, str, Vector((le_level_subset->get_num_levels() < 10) ? -10 : 0, 16), LAYER_GUI); + context.draw_text(white_text, str, Vector((le_level_subset->get_num_levels() < 10) ? -10 : 0, 16), LEFT_ALLIGN, LAYER_GUI); if(!le_help_shown) - context.draw_text(white_small_text, "F1 for Help", Vector(10, 430), LAYER_GUI); + context.draw_text(white_small_text, "F1 for Help", Vector(10, 430), LEFT_ALLIGN, LAYER_GUI); if(display_level_info.check()) - context.draw_text_center(white_text, le_level->name.c_str(), Vector(0, 0), LAYER_GUI); + context.draw_text(white_text, le_level->name.c_str(), Vector(screen->w/2, 0), CENTER_ALLIGN, LAYER_GUI); } else { if(!Menu::current()) - context.draw_text(white_small_text, "No Level Subset loaded - Press ESC and choose one in the menu", Vector(10, 430), LAYER_GUI); + context.draw_text(white_small_text, "No Level Subset loaded - Press ESC and choose one in the menu", Vector(10, 430), LEFT_ALLIGN, LAYER_GUI); else - context.draw_text(white_small_text, "No Level Subset loaded", Vector(10, 430), LAYER_GUI); + context.draw_text(white_small_text, "No Level Subset loaded", Vector(10, 430), LEFT_ALLIGN, LAYER_GUI); } } @@ -1782,13 +1782,13 @@ context.draw_gradient(Color(0,0,0), Color(255,255,255), LAYER_BACKGROUND0); drawinterface(context); - context.draw_text_center(blue_text, "- Help -", Vector(0, 30), LAYER_GUI); + context.draw_text(blue_text, "- Help -", Vector(screen->w/2, 30), CENTER_ALLIGN, LAYER_GUI); for(unsigned int t = 0; t < sizeof(text[i])/sizeof(char *); t++) - context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->get_height())), LAYER_GUI); + context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->get_height())), LEFT_ALLIGN, LAYER_GUI); sprintf(str,"Press any key to continue - Page %d/%d?", i, static_cast<int>(sizeof(text))); - context.draw_text(gold_text, str, Vector(0, 0), LAYER_GUI); + context.draw_text(gold_text, str, Vector(0, 0), LEFT_ALLIGN, LAYER_GUI); context.do_drawing(); Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- gameobjs.cpp 14 Sep 2004 10:27:05 -0000 1.49 +++ gameobjs.cpp 16 Sep 2004 15:04:17 -0000 1.50 @@ -133,7 +133,7 @@ void FloatingScore::draw(DrawingContext& context) { - context.draw_text(gold_text, str, position, LAYER_OBJECTS); + context.draw_text(gold_text, str, position, LEFT_ALLIGN, LAYER_OBJECTS); } /* Trampoline */ Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- title.cpp 6 Aug 2004 11:43:10 -0000 1.116 +++ title.cpp 16 Sep 2004 15:04:17 -0000 1.117 @@ -328,12 +328,12 @@ context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30), LAYER_FOREGROUND1+1); - context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1); + context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(white_small_text, _("Copyright (c) 2003 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions; see the file COPYING\n" - "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LAYER_FOREGROUND1); + "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LEFT_ALLIGN, LAYER_FOREGROUND1); /* Don't draw menu, if quit is true */ Menu* menu = Menu::current(); Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- worldmap.cpp 15 Sep 2004 21:59:30 -0000 1.118 +++ worldmap.cpp 16 Sep 2004 15:04:18 -0000 1.119 @@ -906,16 +906,12 @@ context.draw_gradient(Color (200,240,220), Color(200,200,220), LAYER_BACKGROUND0); - context.draw_text_center(blue_text, _("GAMEOVER"), - Vector(0, 200), LAYER_FOREGROUND1); - -// sprintf(str, _("SCORE: %d"), total_stats.get_points(SCORE_STAT)); -// context.draw_text_center(gold_text, str, -// Vector(0, 230), LAYER_FOREGROUND1); + context.draw_text(blue_text, _("GAMEOVER"), + Vector(screen->w/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1); sprintf(str, _("COINS: %d"), player_status.distros); - context.draw_text_center(gold_text, str, - Vector(0, screen->w - 32), LAYER_FOREGROUND1); + context.draw_text(gold_text, str, + Vector(screen->w/2, screen->w - 32), CENTER_ALLIGN, LAYER_FOREGROUND1); total_stats.draw_message_info(context, _("Total Statistics")); @@ -1068,23 +1064,23 @@ char str[80]; sprintf(str, " %d", total_stats.get_points(SCORE_STAT)); - context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1); - context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1); + context.draw_text(white_text, _("SCORE"), Vector(0, 0), LEFT_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(96, 0), LEFT_ALLIGN, LAYER_FOREGROUND1); sprintf(str, "%d", player_status.distros); context.draw_text(white_text, _("COINS"), Vector(screen->w/2 - 16*5, 0), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(gold_text, str, Vector(screen->w/2 + (16*5)/2, 0), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); if (player_status.lives >= 5) { sprintf(str, "%dx", player_status.lives); context.draw_text(gold_text, str, Vector(screen->w - gold_text->get_text_width(str) - tux_life->w, 0), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_surface(tux_life, Vector(screen->w - - gold_text->get_text_width("9"), 0), LAYER_FOREGROUND1); + gold_text->get_text_width("9"), 0), LEFT_ALLIGN, LAYER_FOREGROUND1); } else { @@ -1095,7 +1091,7 @@ } context.draw_text(white_text, _("LIVES"), Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 0), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); if (!tux->is_moving()) { @@ -1109,27 +1105,27 @@ if(i->title == "") get_level_title(*i); - context.draw_text_center(white_text, i->title, - Vector(0, screen->h - white_text->get_height() - 30), - LAYER_FOREGROUND1); + context.draw_text(white_text, i->title, + Vector(screen->w/2, screen->h - white_text->get_height() - 30), + CENTER_ALLIGN, LAYER_FOREGROUND1); i->statistics.draw_worldmap_info(context); } /* Display an in-map message in the map, if any as been selected */ if(!i->map_message.empty() && !i->passive_message) - context.draw_text_center(gold_text, i->map_message, - Vector(0, screen->h - white_text->get_height() - 60), - LAYER_FOREGROUND1); + context.draw_text(gold_text, i->map_message, + Vector(screen->w/2, screen->h - white_text->get_height() - 60), + CENTER_ALLIGN, LAYER_FOREGROUND1); break; } } } /* Display a passive message in the map, if needed */ if(passive_message_timer.check()) - context.draw_text_center(gold_text, passive_message, - Vector(0, screen->h - white_text->get_height() - 60), - LAYER_FOREGROUND1); + context.draw_text(gold_text, passive_message, + Vector(screen->w/2, screen->h - white_text->get_height() - 60), + CENTER_ALLIGN, LAYER_FOREGROUND1); } void Index: high_scores.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- high_scores.cpp 28 Jul 2004 23:06:12 -0000 1.26 +++ high_scores.cpp 16 Sep 2004 15:04:17 -0000 1.27 @@ -102,12 +102,12 @@ { context.draw_surface(bkgd, Vector(0, 0), LAYER_BACKGROUND0); - context.draw_text_center(blue_text, "Congratulations", - Vector(0, 130), LAYER_FOREGROUND1); + context.draw_text(blue_text, "Congratulations", + Vector(screen->w/2, 130), CENTER_ALLIGN, LAYER_FOREGROUND1); context.draw_text(blue_text, "Your score:", Vector(150, 180), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); sprintf(str, "%d", hs_score); - context.draw_text(yellow_nums, str, Vector(250, 170), LAYER_FOREGROUND1); + context.draw_text(yellow_nums, str, Vector(250, 170), LEFT_ALLIGN, LAYER_FOREGROUND1); Menu::current()->draw(context); Menu::current()->action(); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.181 retrieving revision 1.182 diff -u -d -r1.181 -r1.182 --- gameloop.cpp 16 Sep 2004 11:56:39 -0000 1.181 +++ gameloop.cpp 16 Sep 2004 15:04:16 -0000 1.182 @@ -175,23 +175,23 @@ DrawingContext context; currentsector->background->draw(context); - context.draw_text_center(gold_text, level->get_name(), Vector(0, 220), - LAYER_FOREGROUND1); + context.draw_text(gold_text, level->get_name(), Vector(screen->w/2, 160), + CENTER_ALLIGN, LAYER_FOREGROUND1); sprintf(str, "TUX x %d", player_status.lives); - context.draw_text_center(white_text, str, Vector(0, 240), - LAYER_FOREGROUND1); + context.draw_text(white_text, str, Vector(screen->w/2, 210), + CENTER_ALLIGN, LAYER_FOREGROUND1); if(level->get_author().size()) - context.draw_text_center(white_small_text, + context.draw_text(white_small_text, std::string(_("by ")) + level->get_author(), - Vector(0, 360), LAYER_FOREGROUND1); + Vector(screen->w/2, 350), CENTER_ALLIGN, LAYER_FOREGROUND1); if(flip_level) - context.draw_text_center(white_text, + context.draw_text(white_text, _("Level Vertically Flipped!"), - Vector(0, 310), LAYER_FOREGROUND1); + Vector(screen->w/2, 310), CENTER_ALLIGN, LAYER_FOREGROUND1); if(best_level_statistics != NULL) best_level_statistics->draw_message_info(context, _("Best Level Statistics")); @@ -357,7 +357,7 @@ tux.base.x, tux.base.y); context->draw_text(white_text, buf, Vector(0, screen->h - white_text->get_height()), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); context->do_drawing(); SDL_Delay(1000); } @@ -630,8 +630,8 @@ context->draw_filled_rect( Vector(0,0), Vector(screen->w, screen->h), Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1); - context->draw_text_center(blue_text, _("PAUSE - Press 'P' To Play"), - Vector(0, 230), LAYER_FOREGROUND1+2); + context->draw_text(blue_text, _("PAUSE - Press 'P' To Play"), + Vector(screen->w/2, 230), CENTER_ALLIGN, LAYER_FOREGROUND1+2); char str1[60]; char str2[124]; @@ -640,10 +640,10 @@ context->draw_text(blue_text, str1, Vector((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2, 340), - LAYER_FOREGROUND1+2); + LEFT_ALLIGN, LAYER_FOREGROUND1+2); context->draw_text(white_text, str2, Vector(((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2)+blue_text->get_text_width(str1), 340), - LAYER_FOREGROUND1+2); + LEFT_ALLIGN, LAYER_FOREGROUND1+2); } if(Menu::current()) @@ -810,38 +810,38 @@ char str[60]; snprintf(str, 60, " %d", global_stats.get_points(SCORE_STAT)); - context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1); - context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1); + context.draw_text(white_text, _("SCORE"), Vector(0, 0), LEFT_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(96, 0), LEFT_ALLIGN, LAYER_FOREGROUND1); if(st_gl_mode == ST_GL_TEST) { context.draw_text(white_text, _("Press ESC To Return"), Vector(0,20), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); } if(!time_left.check()) { - context.draw_text_center(white_text, _("TIME's UP"), Vector(0, 0), - LAYER_FOREGROUND1); + context.draw_text(white_text, _("TIME's UP"), Vector(screen->w/2, 0), + CENTER_ALLIGN, LAYER_FOREGROUND1); } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) { sprintf(str, " %d", time_left.get_left() / 1000 ); - context.draw_text_center(white_text, _("TIME"), - Vector(0, 0), LAYER_FOREGROUND1); - context.draw_text_center(gold_text, str, - Vector(4*16, 0), LAYER_FOREGROUND1); + context.draw_text(white_text, _("TIME"), + Vector(screen->w/2, 0), CENTER_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, + Vector(screen->w/2 + 4*16, 0), CENTER_ALLIGN, LAYER_FOREGROUND1); } sprintf(str, " %d", player_status.distros); context.draw_text(white_text, _("COINS"), Vector(screen->w - white_text->get_text_width(_("COINS"))-white_text->get_text_width(" 99"), 0), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(gold_text, str, - Vector(screen->w - gold_text->get_text_width(" 99"), 0),LAYER_FOREGROUND1); + Vector(screen->w - gold_text->get_text_width(" 99"), 0),LEFT_ALLIGN, LAYER_FOREGROUND1); if (player_status.lives >= 5) { sprintf(str, "%dx", player_status.lives); float x = screen->w - gold_text->get_text_width(str) - tux_life->w; - context.draw_text(gold_text, str, Vector(x, 20), LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(x, 20), LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_surface(tux_life, Vector(screen->w - 16, 20), LAYER_FOREGROUND1); } @@ -855,16 +855,16 @@ context.draw_text(white_text, _("LIVES"), Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 20), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); if(show_fps) { sprintf(str, "%2.1f", fps_fps); context.draw_text(white_text, "FPS", Vector(screen->w - white_text->get_text_width("FPS "), 40), - LAYER_FOREGROUND1); + LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(gold_text, str, - Vector(screen->w-4*16, 40), LAYER_FOREGROUND1); + Vector(screen->w-4*16, 40), LEFT_ALLIGN, LAYER_FOREGROUND1); } } @@ -876,14 +876,14 @@ DrawingContext context; currentsector->background->draw(context); - context.draw_text_center(blue_text, _("Result:"), Vector(0, 200), - LAYER_FOREGROUND1); + context.draw_text(blue_text, _("Result:"), Vector(screen->w/2, 200), + CENTER_ALLIGN, LAYER_FOREGROUND1); sprintf(str, _("SCORE: %d"), global_stats.get_points(SCORE_STAT)); - context.draw_text_center(gold_text, str, Vector(0, 224), LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(screen->w/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); sprintf(str, _("COINS: %d"), player_status.distros); - context.draw_text_center(gold_text, str, Vector(0, 256), LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(screen->w/2, 256), CENTER_ALLIGN, LAYER_FOREGROUND1); context.do_drawing(); @@ -940,8 +940,8 @@ fadeout(256); DrawingContext context; - context.draw_text_center(white_text, "Loading...", - Vector(0, screen->h/2), LAYER_FOREGROUND1); + context.draw_text(white_text, "Loading...", + Vector(screen->w/2, screen->h/2), CENTER_ALLIGN, LAYER_FOREGROUND1); context.do_drawing(); WorldMapNS::WorldMap worldmap; |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 15:04:27
|
Update of /cvsroot/super-tux/supertux/lib/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18913/lib/video Modified Files: drawing_context.cpp drawing_context.h font.cpp font.h Log Message: Changed behavior of centered text drawing and added right allignment, as well. Added a new allignment argument for draw_text(). draw_text_center() is draw_text() with CENTER_ALLIGN in point Vector(screen->w/2, ...). Index: font.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/font.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- font.cpp 15 Sep 2004 18:47:45 -0000 1.7 +++ font.cpp 16 Sep 2004 15:04:16 -0000 1.8 @@ -114,38 +114,34 @@ } void -Font::draw(const std::string& text, const Vector& pos, Uint32 drawing_effect, int alpha) +Font::draw(const std::string& text, const Vector& pos_, int allignment, Uint32 drawing_effect, int alpha) { - if(shadowsize > 0) - draw_chars(shadow_chars, text, pos + Vector(shadowsize, shadowsize), - drawing_effect, alpha); - - draw_chars(chars, text, pos, drawing_effect, alpha); -} + // calculate X positions based on the allignment type + Vector pos = Vector(pos_); + if(allignment == CENTER_ALLIGN) + pos.x -= get_text_width(text) / 2; + else if(allignment == RIGHT_ALLIGN) + pos.x -= get_text_width(text); -void -Font::draw_center(const std::string& text, const Vector& pos, Uint32 drawing_effect, int alpha) -{ - /* Cut lines changes into seperate strings, needed to support centering text - with break lines. + /* Cut lines changes into seperate strings, needed to support center/right text + allignments with break lines. Feel free to replace this hack with a more elegant solution */ char temp[1024]; unsigned int i, l, y; i = y = 0; + while(true) { l = text.find("\n", i); if(l == std::string::npos) { temp[text.copy(temp, text.size() - i, i)] = '\0'; - draw(temp, Vector(screen->w/2 - get_text_width(temp)/2 + pos.x, pos.y + y), - drawing_effect, alpha); + draw_text(temp, pos + Vector(0,y), drawing_effect, alpha); break; } temp[text.copy(temp, l - i, i)] = '\0'; - draw(temp, Vector(screen->w/2 - get_text_width(temp)/2 + pos.x, pos.y + y), - drawing_effect, alpha); + draw_text(temp, pos + Vector(0,y), drawing_effect, alpha); i = l+1; y += h + 2; @@ -153,6 +149,16 @@ } void +Font::draw_text(const std::string& text, const Vector& pos, Uint32 drawing_effect, int alpha) +{ + if(shadowsize > 0) + draw_chars(shadow_chars, text, pos + Vector(shadowsize, shadowsize), + drawing_effect, alpha); + + draw_chars(chars, text, pos, drawing_effect, alpha); +} + +void Font::draw_chars(Surface* pchars, const std::string& text, const Vector& pos, Uint32 drawing_effect, int alpha) { @@ -303,9 +309,9 @@ default: font = reference_font; break; } - context.draw_text_center(font, + context.draw_text(font, names[i].substr(1, names[i].size()-1), - Vector(0, screen->h + y - scroll), LAYER_FOREGROUND1); + Vector(screen->w/2, screen->h + y - scroll), CENTER_ALLIGN, LAYER_FOREGROUND1); y += font->get_height() + ITEMS_SPACE; } Index: drawing_context.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/drawing_context.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- drawing_context.cpp 15 Sep 2004 18:47:45 -0000 1.5 +++ drawing_context.cpp 16 Sep 2004 15:04:16 -0000 1.6 @@ -78,28 +78,8 @@ void DrawingContext::draw_text(Font* font, const std::string& text, - const Vector& position, int layer, Uint32 drawing_effect, int alpha) -{ - DrawingRequest request; - - request.type = TEXT; - request.layer = layer; - request.pos = transform.apply(position); - request.drawing_effect = drawing_effect; - - TextRequest* textrequest = new TextRequest; - textrequest->font = font; - textrequest->text = text; - textrequest->center = false; - textrequest->alpha = alpha; - request.request_data = textrequest; - - drawingrequests.push_back(request); -} - -void -DrawingContext::draw_text_center(Font* font, const std::string& text, - const Vector& position, int layer, Uint32 drawing_effect, int alpha) + const Vector& position, int allignment, int layer, + Uint32 drawing_effect, int alpha) { DrawingRequest request; @@ -111,7 +91,7 @@ TextRequest* textrequest = new TextRequest; textrequest->font = font; textrequest->text = text; - textrequest->center = true; + textrequest->allignment = allignment; textrequest->alpha = alpha; request.request_data = textrequest; @@ -219,10 +199,7 @@ { TextRequest* textrequest = (TextRequest*) request.request_data; - if(textrequest->center) - textrequest->font->draw_center(textrequest->text, request.pos, request.drawing_effect, textrequest->alpha); - else - textrequest->font->draw(textrequest->text, request.pos, request.drawing_effect, textrequest->alpha); + textrequest->font->draw(textrequest->text, request.pos, textrequest->allignment, request.drawing_effect, textrequest->alpha); delete textrequest; } Index: drawing_context.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/drawing_context.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- drawing_context.h 15 Sep 2004 18:47:45 -0000 1.6 +++ drawing_context.h 16 Sep 2004 15:04:16 -0000 1.7 @@ -67,10 +67,8 @@ Uint32 drawing_effect = NONE_EFFECT); /// Draws a text. void draw_text(Font* font, const std::string& text, const Vector& position, - int layer, Uint32 drawing_effect = NONE_EFFECT, int alpha = 255); - /// Draws aligned text. - void draw_text_center(Font* font, const std::string& text, - const Vector& position, int layer, Uint32 drawing_effect = NONE_EFFECT, int alpha = 255); + int allignment, int layer, + Uint32 drawing_effect = NONE_EFFECT, int alpha = 255); /// Draws a color gradient onto the whole screen */ void draw_gradient(Color from, Color to, int layer); /// Fills a rectangle. @@ -129,7 +127,7 @@ { Font* font; std::string text; - bool center; + int allignment; int alpha; }; Index: font.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/font.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- font.h 15 Sep 2004 18:47:45 -0000 1.8 +++ font.h 16 Sep 2004 15:04:16 -0000 1.9 @@ -29,6 +29,12 @@ namespace SuperTux { + enum { + LEFT_ALLIGN, + CENTER_ALLIGN, + RIGHT_ALLIGN + }; + /// Font class Font { @@ -60,13 +66,18 @@ /// returns the height of the font. float get_height() const; + /** Draws the given text to the screen. Also needs the position. + * Type of alignment, drawing effect and alpha are optional. */ + void draw(const std::string& text, const Vector& pos, + int allignment = LEFT_ALLIGN, + Uint32 drawing_effect = NONE_EFFECT, int alpha = 255); + private: friend class DrawingContext; - void draw(const std::string& text, const Vector& pos, - Uint32 drawing_effect = NONE_EFFECT, int alpha = 255); - void draw_center(const std::string& text, const Vector& pos, + void draw_text(const std::string& text, const Vector& pos, Uint32 drawing_effect = NONE_EFFECT, int alpha = 255); + void draw_chars(Surface* pchars, const std::string& text, const Vector& position, Uint32 drawing_effect, int alpha); |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 15:04:25
|
Update of /cvsroot/super-tux/supertux/lib/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18913/lib/gui Modified Files: button.cpp menu.cpp Log Message: Changed behavior of centered text drawing and added right allignment, as well. Added a new allignment argument for draw_text(). draw_text_center() is draw_text() with CENTER_ALLIGN in point Vector(screen->w/2, ...). Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- menu.cpp 8 Sep 2004 17:32:32 -0000 1.13 +++ menu.cpp 16 Sep 2004 15:04:16 -0000 1.14 @@ -531,9 +531,9 @@ { case MN_DEACTIVE: { - context.draw_text_center(deactive_font, pitem.text, - Vector(0, y_pos - int(deactive_font->get_height()/2)), - LAYER_GUI); + context.draw_text(deactive_font, pitem.text, + Vector(screen->w/2, y_pos - int(deactive_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); break; } @@ -551,9 +551,9 @@ } case MN_LABEL: { - context.draw_text_center(label_font, - pitem.text, Vector(0, y_pos - int(label_font->get_height()/2)), - LAYER_GUI); + context.draw_text(label_font, pitem.text, + Vector(screen->w/2, y_pos - int(label_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); break; } case MN_TEXTFIELD: @@ -585,21 +585,21 @@ context.draw_text(field_font, pitem.get_input_with_symbol(true), Vector(input_pos, y_pos - int(field_font->get_height()/2)), - LAYER_GUI); + LEFT_ALLIGN, LAYER_GUI); else context.draw_text(field_font, pitem.get_input_with_symbol(false), Vector(input_pos, y_pos - int(field_font->get_height()/2)), - LAYER_GUI); + LEFT_ALLIGN, LAYER_GUI); } else context.draw_text(field_font, pitem.input, Vector(input_pos, y_pos - int(field_font->get_height()/2)), - LAYER_GUI); + LEFT_ALLIGN, LAYER_GUI); context.draw_text(text_font, pitem.text, Vector(text_pos, y_pos - int(text_font->get_height()/2)), - LAYER_GUI); + LEFT_ALLIGN, LAYER_GUI); break; } case MN_STRINGSELECT: @@ -626,19 +626,19 @@ Vector(list_pos_2, 18), Color(0,0,0,128), LAYER_GUI - 5); - context.draw_text_center(text_font, (*pitem.list.second), - Vector(text_pos, y_pos - int(text_font->get_height()/2)), - LAYER_GUI); - context.draw_text_center(text_font, pitem.text, - Vector(list_pos_2/2, y_pos - int(text_font->get_height()/2)), - LAYER_GUI); + context.draw_text(text_font, (*pitem.list.second), + Vector(screen->w/2 + text_pos, y_pos - int(text_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); + context.draw_text(text_font, pitem.text, + Vector(screen->w/2 + list_pos_2/2, y_pos - int(text_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); break; } case MN_BACK: { - context.draw_text_center(text_font, pitem.text, - Vector(0, y_pos - int(text_font->get_height()/2)), - LAYER_GUI); + context.draw_text(text_font, pitem.text, + Vector(screen->w/2, y_pos - int(text_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); context.draw_surface(back, Vector(x_pos + text_width/2 + 16, y_pos - 8), LAYER_GUI); @@ -647,9 +647,9 @@ case MN_TOGGLE: { - context.draw_text_center(text_font, pitem.text, - Vector(0, y_pos - (text_font->get_height()/2)), - LAYER_GUI); + context.draw_text(text_font, pitem.text, + Vector(screen->w/2, y_pos - (text_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); if(pitem.toggled) context.draw_surface(checkbox_checked, @@ -662,15 +662,15 @@ break; } case MN_ACTION: - context.draw_text_center(text_font, pitem.text, - Vector(0, y_pos - int(text_font->get_height()/2)), - LAYER_GUI); + context.draw_text(text_font, pitem.text, + Vector(screen->w/2, y_pos - int(text_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); break; case MN_GOTO: - context.draw_text_center(text_font, pitem.text, - Vector(0, y_pos - int(text_font->get_height()/2)), - LAYER_GUI); + context.draw_text(text_font, pitem.text, + Vector(screen->w/2, y_pos - int(text_font->get_height()/2)), + CENTER_ALLIGN, LAYER_GUI); break; } } Index: button.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/gui/button.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- button.cpp 26 Jul 2004 15:48:37 -0000 1.5 +++ button.cpp 16 Sep 2004 15:04:15 -0000 1.6 @@ -126,9 +126,9 @@ i = rect.w + (int)info_font->get_text_width(info); if(!info.empty()) - context.draw_text(info_font, info, Vector(i + rect.x - info_font->get_text_width(info), rect.y), LAYER_GUI); + context.draw_text(info_font, info, Vector(i + rect.x - info_font->get_text_width(info), rect.y), LEFT_ALLIGN, LAYER_GUI); sprintf(str,"(%s)", SDL_GetKeyName(shortcut)); - context.draw_text(info_font, str, Vector(i + rect.x - info_font->get_text_width(str), rect.y + info_font->get_height()+2), LAYER_GUI); + context.draw_text(info_font, str, Vector(i + rect.x - info_font->get_text_width(str), rect.y + info_font->get_height()+2), LEFT_ALLIGN, LAYER_GUI); } if(state == BUTTON_PRESSED || state == BUTTON_DEACTIVE) fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200); |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 11:56:48
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8957/src Modified Files: gameloop.cpp Log Message: Added a "gotoend" cheat to put Tux near the end of the level. Also improved the pause hack. Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.180 retrieving revision 1.181 diff -u -d -r1.180 -r1.181 --- gameloop.cpp 15 Sep 2004 22:39:21 -0000 1.180 +++ gameloop.cpp 16 Sep 2004 11:56:39 -0000 1.181 @@ -365,6 +365,11 @@ case SDLK_p: if(!Menu::current()) { + // "lifeup" cheat activates pause cause of the 'p' + // so work around to ignore it + if(compare_last(last_keys, "lifeu")) + break; + if(game_pause) { game_pause = false; @@ -414,18 +419,6 @@ { player_status.lives++; last_keys.clear(); - // "lifeup" activates pause cause of the 'p' - // so work around to ignore it - if(game_pause) - { - game_pause = false; - Ticks::pause_stop(); - } - else - { - game_pause = true; - Ticks::pause_start(); - } } if(compare_last(last_keys, "lifedown")) { @@ -437,21 +430,28 @@ tux.invincible_timer.start(time_left.get_left()); last_keys.clear(); } - if(compare_last(last_keys, "shrink")) + if(compare_last(last_keys, "shrink")) { // remove powerups tux.kill(tux.SHRINK); last_keys.clear(); } - if(compare_last(last_keys, "kill")) + if(compare_last(last_keys, "kill")) { // kill Tux tux.kill(tux.KILL); last_keys.clear(); } - if(compare_last(last_keys, "hover")) + if(compare_last(last_keys, "hover")) { // toggle hover ability on/off tux.enable_hover = !tux.enable_hover; last_keys.clear(); } + if(compare_last(last_keys, "gotoend")) + { // goes to the end of the level + tux.base.x = (currentsector->solids->get_width()*32) - (screen->w*2); + tux.base.y = 0; + currentsector->camera->reset(Vector(tux.base.x, tux.base.y)); + last_keys.clear(); + } break; case SDL_JOYAXISMOTION: |
|
From: Ricardo C. <rm...@us...> - 2004-09-16 11:26:24
|
Update of /cvsroot/super-tux/supertux/lib/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2973/lib/video Modified Files: surface.cpp Log Message: Fixed draw_part() when alpha != 255. This fixes the displaying of level statistics. Index: surface.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- surface.cpp 5 Sep 2004 09:27:24 -0000 1.9 +++ surface.cpp 16 Sep 2004 11:26:14 -0000 1.10 @@ -995,10 +995,10 @@ /* Create a Surface, make it using colorkey, blit surface into temp, apply alpha to temp sur, blit the temp into the screen */ /* Note: this has to be done, since SDL doesn't allow to set alpha to surfaces that - already have an alpha mask yet... */ + already have an alpha mask, yet... */ SDL_Surface* sdl_surface_copy = SDL_CreateRGBSurface (sdl_surface->flags, - sdl_surface->w, sdl_surface->h, sdl_surface->format->BitsPerPixel, + (int)w, (int)h, sdl_surface->format->BitsPerPixel, sdl_surface->format->Rmask, sdl_surface->format->Gmask, sdl_surface->format->Bmask, 0); @@ -1007,7 +1007,7 @@ SDL_SetColorKey(sdl_surface_copy, SDL_SRCCOLORKEY, colorkey); - SDL_BlitSurface(sdl_surface, NULL, sdl_surface_copy, NULL); + SDL_BlitSurface(sdl_surface, &src, sdl_surface_copy, NULL); SDL_SetAlpha(sdl_surface_copy ,SDL_SRCALPHA,alpha); int ret = SDL_BlitSurface(sdl_surface_copy, NULL, screen, &dest); |
|
From: Marek M. <wa...@us...> - 2004-09-15 22:39:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2315/src Modified Files: gameloop.cpp player.cpp player.h Log Message: disabled hovering by default (needs tweaking!) added cheat code "hover" to toggle hovering on/off Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- player.cpp 15 Sep 2004 15:15:24 -0000 1.167 +++ player.cpp 15 Sep 2004 22:39:23 -0000 1.168 @@ -161,6 +161,7 @@ double_jumping = false; can_jump = true; can_double_jump = false; + enable_hover = false; butt_jump = false; frame_main = 0; @@ -560,7 +561,9 @@ } // Hover - if (input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0) + //(disabled by default, use cheat code "hover" to toggle on/off) + //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys + if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0) { physic.set_velocity_y(-1); } Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- player.h 15 Sep 2004 15:15:25 -0000 1.85 +++ player.h 15 Sep 2004 22:39:24 -0000 1.86 @@ -150,6 +150,7 @@ bool double_jumping; bool can_jump; bool can_double_jump; + bool enable_hover; bool butt_jump; int frame_; int frame_main; Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.179 retrieving revision 1.180 diff -u -d -r1.179 -r1.180 --- gameloop.cpp 15 Sep 2004 22:12:00 -0000 1.179 +++ gameloop.cpp 15 Sep 2004 22:39:21 -0000 1.180 @@ -447,6 +447,11 @@ tux.kill(tux.KILL); last_keys.clear(); } + if(compare_last(last_keys, "hover")) + { // toggle hover ability on/off + tux.enable_hover = !tux.enable_hover; + last_keys.clear(); + } break; case SDL_JOYAXISMOTION: |
|
From: Ricardo C. <rm...@us...> - 2004-09-15 22:13:00
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28300/po Modified Files: de.po es.po fr.po nl.po nn.po pt.po supertux.pot Log Message: Update translation files. Translated Portuguese. Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- es.po 14 Sep 2004 22:59:55 -0000 1.11 +++ es.po 15 Sep 2004 22:12:48 -0000 1.12 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SuperTux-CVS\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" "PO-Revision-Date: 2004-06-09 23:10+0200\n" "Last-Translator: Javier Beaumont <dem...@us...>\n" "Language-Team: Spanish Team <sup...@li...>\n" @@ -18,67 +18,71 @@ "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "por " -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Pulsa 'P' para continuar" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "Jugando: " -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "PUNTOS" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "Pulsa ESC para volver" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "FUERA DE TIEMPO" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "TIEMPO" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "MONEDAS" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "PUNTOS: %d" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "MONEDAS: %d" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "" @@ -207,6 +211,35 @@ msgid "Enter your name:" msgstr "Introduce tu nombre:" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -227,10 +260,14 @@ msgid "Are you sure you want to delete slot" msgstr "¿Estás seguro de que quieres borrar el slot %d?" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "FIN DEL JUEGO" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "" + #: lib/app/setup.cpp:774 #, c-format msgid "" Index: nn.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/nn.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nn.po 14 Sep 2004 22:59:55 -0000 1.2 +++ nn.po 15 Sep 2004 22:12:48 -0000 1.3 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: nn\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" "PO-Revision-Date: 2004-07-19 12:55+0200\n" "Last-Translator: Karl Ove Hufthammer <ka...@hu...>\n" "Language-Team: Norwegian Nynorsk <i1...@li...>\n" @@ -17,67 +17,71 @@ "X-Generator: KBabel 1.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "av " -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "Brettet er snudd opp-ned!" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "PAUSE â Trykk «P» for Ã¥ halda fram" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "Brett: " -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "POENG" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "Trykk «Escape» for Ã¥ gÃ¥ tilbake" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "DU HAR BRUKT OPP TIDA" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "TID" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "MYNTAR" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "LIV" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "Resultat:" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "POENG: %d" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "MYNTAR: %d" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "" @@ -206,6 +210,35 @@ msgid "Enter your name:" msgstr "Skriv inn namnet ditt:" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -224,10 +257,14 @@ msgid "Are you sure you want to delete slot" msgstr "Er du sikker pÃ¥ at du vil sletta plass %d?" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "SPELET ER SLUTT" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "" + #: lib/app/setup.cpp:774 #, c-format msgid "" Index: fr.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/fr.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fr.po 14 Sep 2004 22:59:55 -0000 1.2 +++ fr.po 15 Sep 2004 22:12:48 -0000 1.3 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" "PO-Revision-Date: 2004-06-17 22:11+0200\n" "Last-Translator: Frederic Rodrigo <f.r...@fr...>\n" "Language-Team: Français\n" @@ -15,67 +15,71 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "par " -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "PAUSE - Pressez P pour Jouer" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "Jouer : " -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "SCORE" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "Pressez ÃCHAP pour revenir" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "TEMPS écoulé" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "TEMPS" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "PIÃCES" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "VIES" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "Résultat :" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "SCORE : %d" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "PIÃCES : %d" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "" @@ -204,6 +208,35 @@ msgid "Enter your name:" msgstr "Entrez votre nom :" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -218,10 +251,14 @@ msgid "Are you sure you want to delete slot" msgstr "Ãtes vous sûr de vouloir supprimer le slot %d ?" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "" + #: lib/app/setup.cpp:774 #, c-format msgid "" Index: nl.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/nl.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nl.po 14 Sep 2004 22:59:55 -0000 1.2 +++ nl.po 15 Sep 2004 22:12:48 -0000 1.3 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACGE VERSION\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" "PO-Revision-Date: 2004-06-07 HO:MI+ZONE\n" "Last-Translator: Frank van der Loo <fr...@li...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -15,67 +15,71 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "door " -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "PAUSE - Druk op 'P' Om Verder Te Gaan" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "Level: " -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "SCORE" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "Druk op ESC Om Terug Te Gaan" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "TIJD is OM" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "TIJD" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "MUNTEN" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "LEVENS" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "Resultaat:" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "SCORE: %d" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "MUNTEN: %d" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "" @@ -204,6 +208,35 @@ msgid "Enter your name:" msgstr "Voer uw naam in:" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -222,10 +255,14 @@ msgid "Are you sure you want to delete slot" msgstr "Weet u zeker dat u slot %d wilt verwijderen?" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "GAMEOVER" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "" + #: lib/app/setup.cpp:774 #, c-format msgid "" Index: de.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/de.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- de.po 14 Sep 2004 22:59:55 -0000 1.9 +++ de.po 15 Sep 2004 22:12:48 -0000 1.10 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: <ma...@br...>\n" "Language-Team: German <de...@li...>\n" @@ -17,67 +17,71 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "" -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "" -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "" @@ -209,6 +213,35 @@ msgid "Enter your name:" msgstr "" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -222,10 +255,14 @@ msgid "Are you sure you want to delete slot" msgstr "" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "" + #: lib/app/setup.cpp:774 #, c-format msgid "" Index: pt.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/pt.po,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pt.po 15 Sep 2004 10:41:27 -0000 1.12 +++ pt.po 15 Sep 2004 22:12:48 -0000 1.13 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pt\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" -"PO-Revision-Date: 2004-09-15 11:51+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" +"PO-Revision-Date: 2004-09-15 23:17+0100\n" "Last-Translator: Ricardo Cruz <ri...@ae...>\n" "Language-Team: European Portuguese\n" "MIME-Version: 1.0\n" @@ -21,67 +21,71 @@ "X-Generator: KBabel 1.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "por " -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "NÃvel Invertido na Vertical!" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "Melhores EstatÃsticas do NÃvel" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Carrega no 'P' para continuar" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "Jogando: " -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "PONTOS" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "Carrega no ESC para sair" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "PASSOU O TEMPO" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "TEMPO" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "MOEDAS" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "PONTOS: %d" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "MOEDAS: %d" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "Slot" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "Livre" @@ -210,6 +214,35 @@ msgid "Enter your name:" msgstr "Insira o seu nome:" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "EstatÃsticas do NÃvel" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "Máx pontos: %d" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "Max matança: %d" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "Min tiros: %d" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "Min tempo necessário: %d" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "Min saltos: %d" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -228,10 +261,14 @@ msgid "Are you sure you want to delete slot" msgstr "Tens a certeza que queres remover o slot" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "FIM DO JOGO" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "EstatÃsticas Totais" + #: lib/app/setup.cpp:774 #, c-format msgid "" Index: supertux.pot =================================================================== RCS file: /cvsroot/super-tux/supertux/po/supertux.pot,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- supertux.pot 14 Sep 2004 22:59:55 -0000 1.7 +++ supertux.pot 15 Sep 2004 22:12:48 -0000 1.8 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-09-15 00:08+0100\n" +"POT-Creation-Date: 2004-09-15 23:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -16,67 +16,71 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/gameloop.cpp:186 +#: src/gameloop.cpp:187 msgid "by " msgstr "" -#: src/gameloop.cpp:192 +#: src/gameloop.cpp:193 msgid "Level Vertically Flipped!" msgstr "" -#: src/gameloop.cpp:612 +#: src/gameloop.cpp:197 +msgid "Best Level Statistics" +msgstr "" + +#: src/gameloop.cpp:628 msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:617 +#: src/gameloop.cpp:633 #, c-format msgid "Playing: " msgstr "" -#: src/gameloop.cpp:792 src/worldmap.cpp:1068 +#: src/gameloop.cpp:808 src/worldmap.cpp:1071 msgid "SCORE" msgstr "" -#: src/gameloop.cpp:797 +#: src/gameloop.cpp:813 msgid "Press ESC To Return" msgstr "" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:818 msgid "TIME's UP" msgstr "" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:822 msgid "TIME" msgstr "" -#: src/gameloop.cpp:813 src/gameloop.cpp:814 src/worldmap.cpp:1072 +#: src/gameloop.cpp:829 src/gameloop.cpp:830 src/worldmap.cpp:1075 msgid "COINS" msgstr "" -#: src/gameloop.cpp:835 src/gameloop.cpp:836 src/worldmap.cpp:1093 -#: src/worldmap.cpp:1094 +#: src/gameloop.cpp:851 src/gameloop.cpp:852 src/worldmap.cpp:1096 +#: src/worldmap.cpp:1097 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:858 +#: src/gameloop.cpp:874 msgid "Result:" msgstr "" -#: src/gameloop.cpp:861 src/worldmap.cpp:911 +#: src/gameloop.cpp:877 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:864 src/worldmap.cpp:915 +#: src/gameloop.cpp:880 src/worldmap.cpp:916 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Slot" msgstr "" -#: src/gameloop.cpp:898 +#: src/gameloop.cpp:914 msgid "Free" msgstr "" @@ -205,6 +209,35 @@ msgid "Enter your name:" msgstr "" +#: src/statistics.cpp:111 +msgid "Level Statistics" +msgstr "" + +#: src/statistics.cpp:113 src/statistics.cpp:140 +#, c-format +msgid "Max score: %d" +msgstr "" + +#: src/statistics.cpp:117 src/statistics.cpp:142 +#, c-format +msgid "Max fragging: %d" +msgstr "" + +#: src/statistics.cpp:119 src/statistics.cpp:144 +#, c-format +msgid "Min shots: %d" +msgstr "" + +#: src/statistics.cpp:121 src/statistics.cpp:146 +#, c-format +msgid "Min time needed: %d" +msgstr "" + +#: src/statistics.cpp:123 src/statistics.cpp:148 +#, c-format +msgid "Min jumps: %d" +msgstr "" + #: src/title.cpp:333 msgid "" "Copyright (c) 2003 SuperTux Devel Team\n" @@ -218,10 +251,14 @@ msgid "Are you sure you want to delete slot" msgstr "" -#: src/worldmap.cpp:908 +#: src/worldmap.cpp:909 msgid "GAMEOVER" msgstr "" +#: src/worldmap.cpp:920 +msgid "Total Statistics" +msgstr "" + #: lib/app/setup.cpp:774 #, c-format msgid "" |
248 messages has been excluded from this view by a project administrator.
