From: Ondřej Hošek Date: Mon, 9 Jan 2006 17:41:11 +0000 (+0000) Subject: Updated the statistics module to be on par with recent developments. We now have... X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d5a14290ef3ba576ce0d6959155a4d45dffddf1f;p=supertux.git Updated the statistics module to be on par with recent developments. We now have smooth fading on the worldmap again, the score isn't being shown anymore and nor is the time when the level contains no timer. SVN-Revision: 2976 --- diff --git a/src/game_session.cpp b/src/game_session.cpp index 613d14322..7baf7c5b7 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -717,6 +717,11 @@ GameSession::start_sequence(const std::string& sequencename) currentsector->add_object(new Fireworks()); } } else if(sequencename == "stoptux") { + if(!end_sequence) { + std::cout << "WARNING: Final target reached without " + << "an active end sequence." << std::endl; + this->start_sequence("endsequence"); + } end_sequence = ENDSEQUENCE_WAITING; } else { std::cout << "Unknown sequence '" << sequencename << "'.\n"; @@ -759,11 +764,12 @@ GameSession::drawresultscreen() context.draw_text(blue_text, _("Result:"), Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1); - sprintf(str, _("SCORE: %d"), global_stats.get_points(SCORE_STAT)); - context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); +// sprintf(str, _("SCORE: %d"), global_stats.get_points(SCORE_STAT)); +// context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); + // y == 256 before removal of score sprintf(str, _("COINS: %d"), player_status->coins); - context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 256), CENTER_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); context.do_drawing(); diff --git a/src/statistics.cpp b/src/statistics.cpp index 44c6bf027..6d11616ff 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -1,6 +1,8 @@ +// $Id$ // -// SuperTux - A Jump'n Run +// SuperTux (Statistics module) // Copyright (C) 2004 Ricardo Cruz +// Copyright (C) 2006 Ondrej Hosek // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -14,8 +16,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include @@ -33,8 +34,8 @@ stat_name_to_string(int stat_enum) { switch(stat_enum) { - case SCORE_STAT: - return "score"; +// case SCORE_STAT: +// return "score"; case COINS_COLLECTED_STAT: return "coins-collected"; case BADGUYS_KILLED_STAT: @@ -86,8 +87,11 @@ Statistics::write(lisp::Writer& writer) } } -#define TOTAL_DISPLAY_TIME 3400 -#define FADING_TIME 600 +//define TOTAL_DISPLAY_TIME 3400 +//define FADING_TIME 600 + +#define TOTAL_DISPLAY_TIME 5 +#define FADING_TIME 1 #define WMAP_INFO_LEFT_X 520 #define WMAP_INFO_RIGHT_X 740 @@ -95,16 +99,24 @@ Statistics::write(lisp::Writer& writer) void Statistics::draw_worldmap_info(DrawingContext& context) { - if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet + if(stats[COINS_COLLECTED_STAT][SPLAYER] == -1) // not initialized yet return; - if(timer.check()) - { +// if(timer.check()) + if (!timer.started()) + { timer.start(TOTAL_DISPLAY_TIME); display_stat++; if(display_stat >= NUM_STATS) - display_stat = 1; + display_stat = 0; + + if((display_stat == TIME_NEEDED_STAT) && (stats[TIME_NEEDED_STAT][STOTAL] == -1)) + { // no timer in level + display_stat++; + if(display_stat >= NUM_STATS) + display_stat = 0; } + } char str[128]; @@ -112,21 +124,20 @@ Statistics::draw_worldmap_info(DrawingContext& context) Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 470), CENTER_ALLIGN, LAYER_GUI); - sprintf(str, _("Max score:")); - context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI); + // Score has been removed + //sprintf(str, _("Max score:")); + //context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI); - sprintf(str, "%d", stats[SCORE_STAT][SPLAYER]); - context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_ALLIGN, LAYER_GUI); - - // draw other small info + //sprintf(str, "%d", stats[SCORE_STAT][SPLAYER]); + //context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_ALLIGN, LAYER_GUI); - int alpha; + float alpha; if(timer.get_timegone() < FADING_TIME) - alpha = int(timer.get_timegone() * 255 / FADING_TIME); + alpha = (timer.get_timegone() * 1.0f / FADING_TIME); else if(timer.get_timeleft() < FADING_TIME) - alpha = int(timer.get_timeleft() * 255 / FADING_TIME); + alpha = (timer.get_timeleft() * 1.0f / FADING_TIME); else - alpha = 255; + alpha = 1.0f; context.push_transform(); context.set_alpha(alpha); @@ -138,7 +149,8 @@ Statistics::draw_worldmap_info(DrawingContext& context) else// if(display_stat == TIME_NEEDED_STAT) sprintf(str, _("Min time needed:")); - context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 508), LEFT_ALLIGN, LAYER_GUI); + // y == 508 before score was removed + context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI); if(display_stat == COINS_COLLECTED_STAT) sprintf(str, "%d/%d", stats[COINS_COLLECTED_STAT][SPLAYER], @@ -150,7 +162,7 @@ Statistics::draw_worldmap_info(DrawingContext& context) 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, 508), RIGHT_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_ALLIGN, LAYER_GUI); context.pop_transform(); } @@ -158,15 +170,15 @@ Statistics::draw_worldmap_info(DrawingContext& context) void Statistics::draw_message_info(DrawingContext& context, std::string title) { - if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet + if(stats[COINS_COLLECTED_STAT][SPLAYER] == -1) // not initialized yet return; context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), CENTER_ALLIGN, LAYER_GUI); char str[128]; - sprintf(str, _( "Max score: %d"), stats[SCORE_STAT][SPLAYER]); - context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 450), CENTER_ALLIGN, LAYER_GUI); + //sprintf(str, _( "Max score: %d"), stats[SCORE_STAT][SPLAYER]); + //context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 450), CENTER_ALLIGN, LAYER_GUI); for(int i = 1; i < NUM_STATS; i++) { @@ -184,7 +196,8 @@ Statistics::draw_message_info(DrawingContext& context, std::string title) stats[TIME_NEEDED_STAT][STOTAL]); - context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI); + // y == (462 + i*18) before score removal + context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, 450 + i*18), CENTER_ALLIGN, LAYER_GUI); } } @@ -222,7 +235,7 @@ Statistics::reset() void Statistics::merge(Statistics& stats_) { - stats[SCORE_STAT][SPLAYER] = std::max(stats[SCORE_STAT][SPLAYER], stats_.stats[SCORE_STAT][SPLAYER]); +// 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]); diff --git a/src/statistics.hpp b/src/statistics.hpp index 7ae61c4fb..08488e673 100644 --- a/src/statistics.hpp +++ b/src/statistics.hpp @@ -1,6 +1,8 @@ +// $Id$ // -// SuperTux - A Jump'n Run +// SuperTux (Statistics module) // Copyright (C) 2004 Ricardo Cruz +// Copyright (C) 2006 Ondrej Hosek // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -14,8 +16,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SUPERTUX_STATISTICS_H #define SUPERTUX_STATISTICS_H @@ -30,7 +31,7 @@ class DrawingContext; #define STOTAL 1 enum { - SCORE_STAT, +// SCORE_STAT, COINS_COLLECTED_STAT, BADGUYS_KILLED_STAT, TIME_NEEDED_STAT,