X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fstatistics.cpp;h=0b9aa0369cf588d87b1100ef2ef4c9eb6926fad1;hb=d4b281559d45406a5d07cf04d89142cdeb90b114;hp=aa215389c61c72db8ebbeefaaa5a81d2efd21eb5;hpb=033c0951d4cb82136300de80b2185085369936fb;p=supertux.git diff --git a/src/statistics.cpp b/src/statistics.cpp index aa215389c..0b9aa0369 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -23,8 +23,10 @@ #include #include #include +#include #include "video/drawing_context.hpp" #include "gettext.hpp" +#include "lisp/writer.hpp" #include "lisp/lisp.hpp" #include "resources.hpp" #include "main.hpp" @@ -38,8 +40,17 @@ namespace { const int nv_secrets = std::numeric_limits::min(); } +float WMAP_INFO_LEFT_X; +float WMAP_INFO_RIGHT_X; +float WMAP_INFO_TOP_Y1; +float WMAP_INFO_TOP_Y2; + Statistics::Statistics() : coins(nv_coins), total_coins(nv_coins), badguys(nv_badguys), total_badguys(nv_badguys), time(nv_time), secrets(nv_secrets), total_secrets(nv_secrets), valid(true), display_stat(0) { + WMAP_INFO_LEFT_X = (SCREEN_WIDTH/2 + 80) + 32; + WMAP_INFO_RIGHT_X = SCREEN_WIDTH/2 + 368; + WMAP_INFO_TOP_Y1 = SCREEN_HEIGHT/2 + 172 - 16; + WMAP_INFO_TOP_Y2 = SCREEN_HEIGHT/2 + 172; } Statistics::~Statistics() @@ -76,11 +87,6 @@ Statistics::write(lisp::Writer& writer) #define TOTAL_DISPLAY_TIME 5 #define FADING_TIME 1 -const float WMAP_INFO_LEFT_X = (800 - 320) + 32; -const float WMAP_INFO_RIGHT_X = 800 - 32; -const float WMAP_INFO_TOP_Y1 = 600 - 128 - 16; -const float WMAP_INFO_TOP_Y2 = 600 - 128; - void Statistics::draw_worldmap_info(DrawingContext& context) { @@ -90,7 +96,7 @@ Statistics::draw_worldmap_info(DrawingContext& context) // skip draw if stats were declared invalid if (!valid) return; - context.draw_text(white_small_text, std::string("- ") + _("Best Level Statistics") + " -", Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, WMAP_INFO_TOP_Y1), CENTER_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, std::string("- ") + _("Best Level Statistics") + " -", Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, WMAP_INFO_TOP_Y1), ALIGN_CENTER, LAYER_GUI); float alpha; if(timer.get_timegone() < FADING_TIME) @@ -105,7 +111,7 @@ Statistics::draw_worldmap_info(DrawingContext& context) char caption_buf[128]; char stat_buf[128]; - switch (display_stat) + switch (display_stat) { case 0: snprintf(caption_buf, sizeof(caption_buf), _("Max coins collected:")); @@ -121,7 +127,7 @@ Statistics::draw_worldmap_info(DrawingContext& context) int csecs = (int)(time * 100); int mins = (int)(csecs / 6000); int secs = (csecs % 6000) / 100; - snprintf(stat_buf, sizeof(stat_buf), "%02d:%02d", mins,secs); + snprintf(stat_buf, sizeof(stat_buf), "%02d:%02d", mins,secs); } break; case 3: @@ -140,8 +146,8 @@ Statistics::draw_worldmap_info(DrawingContext& context) if (display_stat > 3) display_stat = 0; } - context.draw_text(white_small_text, caption_buf, Vector(WMAP_INFO_LEFT_X, WMAP_INFO_TOP_Y2), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_small_text, stat_buf, Vector(WMAP_INFO_RIGHT_X, WMAP_INFO_TOP_Y2), RIGHT_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, caption_buf, Vector(WMAP_INFO_LEFT_X, WMAP_INFO_TOP_Y2), ALIGN_LEFT, LAYER_GUI); + context.draw_text(white_small_text, stat_buf, Vector(WMAP_INFO_RIGHT_X, WMAP_INFO_TOP_Y2), ALIGN_RIGHT, LAYER_GUI); context.pop_transform(); } @@ -159,36 +165,36 @@ Statistics::draw_message_info(DrawingContext& context, std::string title) const float left = (SCREEN_WIDTH - width) / 2; const float right = (SCREEN_WIDTH + width) / 2; - context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), CENTER_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), ALIGN_CENTER, LAYER_GUI); char stat_buf[128]; int py = 450 + 18; snprintf(stat_buf, sizeof(stat_buf), "%d/%d", coins, total_coins); - context.draw_text(white_small_text, _("Max coins collected:"), Vector(left, py), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_small_text, "%d / %d", Vector(right, py), RIGHT_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, _("Max coins collected:"), Vector(left, py), ALIGN_LEFT, LAYER_GUI); + context.draw_text(white_small_text, "%d / %d", Vector(right, py), ALIGN_RIGHT, LAYER_GUI); py+=18; snprintf(stat_buf, sizeof(stat_buf), "%d/%d", badguys, total_badguys); - context.draw_text(white_small_text, _("Max fragging:"), Vector(left, py), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_small_text, "%d / %d", Vector(right, py), RIGHT_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, _("Max fragging:"), Vector(left, py), ALIGN_LEFT, LAYER_GUI); + context.draw_text(white_small_text, "%d / %d", Vector(right, py), ALIGN_RIGHT, LAYER_GUI); py+=18; int csecs = (int)(time * 100); int mins = (int)(csecs / 6000); int secs = (csecs % 6000) / 100; - snprintf(stat_buf, sizeof(stat_buf), "%02d:%02d", mins,secs); - context.draw_text(white_small_text, _("Min time needed:"), Vector(left, py), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_small_text, "%02d:%02d", Vector(right, py), RIGHT_ALLIGN, LAYER_GUI); + snprintf(stat_buf, sizeof(stat_buf), "%02d:%02d", mins,secs); + context.draw_text(white_small_text, _("Min time needed:"), Vector(left, py), ALIGN_LEFT, LAYER_GUI); + context.draw_text(white_small_text, "%02d:%02d", Vector(right, py), ALIGN_RIGHT, LAYER_GUI); py+=18; - + snprintf(stat_buf, sizeof(stat_buf), "%d/%d", secrets, total_secrets); - context.draw_text(white_small_text, _("Max secrets found:"), Vector(left, py), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_small_text, "%d / %d", Vector(right, py), RIGHT_ALLIGN, LAYER_GUI); + context.draw_text(white_small_text, _("Max secrets found:"), Vector(left, py), ALIGN_LEFT, LAYER_GUI); + context.draw_text(white_small_text, "%d / %d", Vector(right, py), ALIGN_RIGHT, LAYER_GUI); py+=18; } -void +void Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, Surface* backdrop) { // skip draw if level was never played @@ -201,7 +207,7 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S // abort if we have no backdrop if (!backdrop) return; - int box_w = 160+110+110; + int box_w = 220+110+110; int box_h = 30+20+20+20; int box_x = (int)((SCREEN_WIDTH - box_w) / 2); int box_y = (int)(SCREEN_HEIGHT / 2) - box_h; @@ -212,58 +218,61 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S int bd_y = box_y + (box_h / 2) - (bd_h / 2); int col1_x = box_x; - int col2_x = col1_x+160; - int col3_x = col2_x+110; + int col2_x = col1_x+200; + int col3_x = col2_x+130; int row1_y = box_y; int row2_y = row1_y+30; int row3_y = row2_y+20; int row4_y = row3_y+20; + context.push_transform(); + context.set_alpha(0.5); context.draw_surface(backdrop, Vector(bd_x, bd_y), LAYER_GUI); + context.pop_transform(); char buf[129]; - context.draw_text(white_text, _("You"), Vector(col2_x, row1_y), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_text, _("Best"), Vector(col3_x, row1_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("You"), Vector(col2_x, row1_y), ALIGN_LEFT, LAYER_GUI); + context.draw_text(white_text, _("Best"), Vector(col3_x, row1_y), ALIGN_LEFT, LAYER_GUI); - context.draw_text(white_text, _("Coins"), Vector(col1_x, row2_y), LEFT_ALLIGN, LAYER_GUI); - snprintf(buf, sizeof(buf), "%d/%d", coins, total_coins); - context.draw_text(gold_text, buf, Vector(col2_x, row2_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Coins"), Vector(col2_x-16, row2_y), ALIGN_RIGHT, LAYER_GUI); + snprintf(buf, sizeof(buf), "%d/%d", std::min(coins, 999), std::min(total_coins, 999)); + context.draw_text(gold_text, buf, Vector(col2_x, row2_y), ALIGN_LEFT, LAYER_GUI); if (best_stats && (best_stats->coins > coins)) { - snprintf(buf, sizeof(buf), "%d/%d", best_stats->coins, best_stats->total_coins); + snprintf(buf, sizeof(buf), "%d/%d", std::min(best_stats->coins, 999), std::min(best_stats->total_coins, 999)); } - context.draw_text(gold_text, buf, Vector(col3_x, row2_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, buf, Vector(col3_x, row2_y), ALIGN_LEFT, LAYER_GUI); - context.draw_text(white_text, _("Secrets"), Vector(col1_x, row4_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Secrets"), Vector(col2_x-16, row4_y), ALIGN_RIGHT, LAYER_GUI); snprintf(buf, sizeof(buf), "%d/%d", secrets, total_secrets); - context.draw_text(gold_text, buf, Vector(col2_x, row4_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, buf, Vector(col2_x, row4_y), ALIGN_LEFT, LAYER_GUI); if (best_stats && (best_stats->secrets > secrets)) { snprintf(buf, sizeof(buf), "%d/%d", best_stats->secrets, best_stats->total_secrets); } - context.draw_text(gold_text, buf, Vector(col3_x, row4_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, buf, Vector(col3_x, row4_y), ALIGN_LEFT, LAYER_GUI); - context.draw_text(white_text, _("Time"), Vector(col1_x, row3_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Time"), Vector(col2_x-16, row3_y), ALIGN_RIGHT, LAYER_GUI); int csecs = (int)(time * 100); int mins = (int)(csecs / 6000); int secs = (csecs % 6000) / 100; snprintf(buf, sizeof(buf), "%02d:%02d", mins,secs); - context.draw_text(gold_text, buf, Vector(col2_x, row3_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, buf, Vector(col2_x, row3_y), ALIGN_LEFT, LAYER_GUI); if (best_stats && (best_stats->time < time)) { int csecs = (int)(best_stats->time * 100); int mins = (int)(csecs / 6000); int secs = (csecs % 6000) / 100; snprintf(buf, sizeof(buf), "%02d:%02d", mins,secs); } - context.draw_text(gold_text, buf, Vector(col3_x, row3_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(gold_text, buf, Vector(col3_x, row3_y), ALIGN_LEFT, LAYER_GUI); } void Statistics::reset() { - coins = 0; - badguys = 0; - time = 0; - secrets = 0; + coins = 0; + badguys = 0; + time = 0; + secrets = 0; } void @@ -297,4 +306,3 @@ Statistics::declare_invalid() { valid = false; } -