X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fstatistics.cpp;h=515fb111e628fd0aa1cd1650fbdf117ade1d0408;hb=7e1ffbded538860c7f647d4597ee3dcb1f0917ca;hp=0086eeec0b18ce5b355e3295f8e17b67294a4bca;hpb=c307442e4bf1352cf1807b171b5ab175ba063b31;p=supertux.git diff --git a/src/statistics.cpp b/src/statistics.cpp index 0086eeec0..515fb111e 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -23,14 +23,17 @@ #include #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" #include "statistics.hpp" #include "log.hpp" +#include "scripting/squirrel_util.hpp" namespace { const int nv_coins = std::numeric_limits::min(); @@ -44,7 +47,7 @@ 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) +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) { WMAP_INFO_LEFT_X = (SCREEN_WIDTH/2 + 80) + 32; WMAP_INFO_RIGHT_X = SCREEN_WIDTH/2 + 368; @@ -56,6 +59,7 @@ Statistics::~Statistics() { } +/* void Statistics::parse(const lisp::Lisp& reader) { @@ -79,118 +83,86 @@ Statistics::write(lisp::Writer& writer) writer.write_int("secrets-found", secrets); writer.write_int("secrets-found-total", total_secrets); } - -//define TOTAL_DISPLAY_TIME 3400 -//define FADING_TIME 600 - -#define TOTAL_DISPLAY_TIME 5 -#define FADING_TIME 1 +*/ void -Statistics::draw_worldmap_info(DrawingContext& context) +Statistics::serialize_to_squirrel(HSQUIRRELVM vm) { - // skip draw if level was never played - if (coins == nv_coins) return; - - // 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); - - float alpha; - if(timer.get_timegone() < FADING_TIME) - alpha = (timer.get_timegone() * 1.0f / FADING_TIME); - else if(timer.get_timeleft() < FADING_TIME) - alpha = (timer.get_timeleft() * 1.0f / FADING_TIME); - else - alpha = 1.0f; - - context.push_transform(); - context.set_alpha(alpha); - - char caption_buf[128]; - char stat_buf[128]; - switch (display_stat) - { - case 0: - snprintf(caption_buf, sizeof(caption_buf), _("Max coins collected:")); - snprintf(stat_buf, sizeof(stat_buf), "%d/%d", coins, total_coins); - break; - case 1: - snprintf(caption_buf, sizeof(caption_buf), _("Max fragging:")); - snprintf(stat_buf, sizeof(stat_buf), "%d/%d", badguys, total_badguys); - break; - case 2: - snprintf(caption_buf, sizeof(caption_buf), _("Min time needed:")); - { - 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); - } - break; - case 3: - snprintf(caption_buf, sizeof(caption_buf), _("Max secrets found:")); - snprintf(stat_buf, sizeof(stat_buf), "%d/%d", secrets, total_secrets); - break; - default: - log_debug << "Invalid stat requested to be drawn" << std::endl; - break; - } + // TODO: there's some bug in the unserialization routines that breaks stuff when an empty statistics table is written, so -- as a workaround -- let's make sure we will actually write something first + if (!((coins != nv_coins) || (total_coins != nv_coins) || (badguys != nv_badguys) || (total_badguys != nv_badguys) || (time != nv_time) || (secrets != nv_secrets) || (total_secrets != nv_secrets))) return; + + sq_pushstring(vm, "statistics", -1); + sq_newtable(vm); + if (coins != nv_coins) Scripting::store_int(vm, "coins-collected", coins); + if (total_coins != nv_coins) Scripting::store_int(vm, "coins-collected-total", total_coins); + if (badguys != nv_badguys) Scripting::store_int(vm, "badguys-killed", badguys); + if (total_badguys != nv_badguys) Scripting::store_int(vm, "badguys-killed-total", total_badguys); + if (time != nv_time) Scripting::store_float(vm, "time-needed", time); + if (secrets != nv_secrets) Scripting::store_int(vm, "secrets-found", secrets); + if (total_secrets != nv_secrets) Scripting::store_int(vm, "secrets-found-total", total_secrets); + sq_createslot(vm, -3); +} - if (!timer.started()) - { - timer.start(TOTAL_DISPLAY_TIME); - display_stat++; - if (display_stat > 3) display_stat = 0; +void +Statistics::unserialize_from_squirrel(HSQUIRRELVM vm) +{ + sq_pushstring(vm, "statistics", -1); + if(SQ_FAILED(sq_get(vm, -2))) { + return; } - - 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.pop_transform(); + Scripting::get_int(vm, "coins-collected", coins); + Scripting::get_int(vm, "coins-collected-total", total_coins); + Scripting::get_int(vm, "badguys-killed", badguys); + Scripting::get_int(vm, "badguys-killed-total", total_badguys); + Scripting::get_float(vm, "time-needed", time); + Scripting::get_int(vm, "secrets-found", secrets); + Scripting::get_int(vm, "secrets-found-total", total_secrets); + sq_pop(vm, 1); } void -Statistics::draw_message_info(DrawingContext& context, std::string title) +Statistics::draw_worldmap_info(DrawingContext& context) { // skip draw if level was never played - // TODO: do we need this? if (coins == nv_coins) return; // skip draw if stats were declared invalid if (!valid) return; - const float width = white_small_text->get_text_width("Max coins collected: 1111 / 1111"); - 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); - - 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); - 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); - 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); - 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); - py+=18; + context.draw_text(small_font, std::string("- ") + _("Best Level Statistics") + " -", Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, WMAP_INFO_TOP_Y1), ALIGN_CENTER, LAYER_GUI,Statistics::header_color); + + std::string caption_buf; + std::string stat_buf; + float posy = WMAP_INFO_TOP_Y2; + for (int stat_no = 0; stat_no < 4; stat_no++) { + switch (stat_no) + { + case 0: + caption_buf = _("Max coins collected:"); + stat_buf = coins_to_string(coins, total_coins); + break; + case 1: + caption_buf = _("Max fragging:"); + stat_buf = frags_to_string(badguys, total_badguys); + break; + case 2: + caption_buf = _("Min time needed:"); + stat_buf = time_to_string(time); + break; + case 3: + caption_buf = _("Max secrets found:"); + stat_buf = secrets_to_string(secrets, total_secrets); + break; + default: + log_debug << "Invalid stat requested to be drawn" << std::endl; + break; + } + + context.draw_text(small_font, caption_buf, Vector(WMAP_INFO_LEFT_X, posy), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); + context.draw_text(small_font, stat_buf, Vector(WMAP_INFO_RIGHT_X, posy), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + posy += small_font->get_height() + 2; + } + } void @@ -230,39 +202,34 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S 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, _("Coins"), Vector(col2_x-16, row2_y), RIGHT_ALLIGN, 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), LEFT_ALLIGN, LAYER_GUI); - if (best_stats && (best_stats->coins > 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(normal_font, _("You"), Vector(col2_x, row1_y), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); + context.draw_text(normal_font, _("Best"), Vector(col3_x, row1_y), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); + + context.draw_text(normal_font, _("Coins"), Vector(col2_x-16, row3_y), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + int coins_best = (best_stats && (best_stats->coins > coins)) ? best_stats->coins : coins; + int total_coins_best = (best_stats && (best_stats->total_coins > total_coins)) ? best_stats->total_coins : total_coins; + context.draw_text(normal_font, coins_to_string(coins, total_coins), Vector(col2_x, row3_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + context.draw_text(normal_font, coins_to_string(coins_best, total_coins_best), Vector(col3_x, row3_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + + context.draw_text(normal_font, _("Secrets"), Vector(col2_x-16, row4_y), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + int secrets_best = (best_stats && (best_stats->secrets > secrets)) ? best_stats->secrets : secrets; + int total_secrets_best = (best_stats && (best_stats->total_secrets > total_secrets)) ? best_stats->total_secrets : total_secrets; + context.draw_text(normal_font, secrets_to_string(secrets, total_secrets), Vector(col2_x, row4_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + context.draw_text(normal_font, secrets_to_string(secrets_best, total_secrets_best), Vector(col3_x, row4_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + + context.draw_text(normal_font, _("Time"), Vector(col2_x-16, row2_y), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + float time_best = (best_stats && (best_stats->time < time)) ? best_stats->time : time; + context.draw_text(normal_font, time_to_string(time), Vector(col2_x, row2_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + context.draw_text(normal_font, time_to_string(time_best), Vector(col3_x, row2_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); +} - context.draw_text(white_text, _("Secrets"), Vector(col2_x-16, row4_y), RIGHT_ALLIGN, 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); - 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(white_text, _("Time"), Vector(col2_x-16, row3_y), RIGHT_ALLIGN, 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); - 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); +void +Statistics::zero() +{ + reset(); + total_coins = 0; + total_badguys = 0; + total_secrets = 0; } void @@ -275,7 +242,7 @@ Statistics::reset() } void -Statistics::merge(Statistics& s2) +Statistics::merge(const Statistics& s2) { if (!s2.valid) return; coins = std::max(coins, s2.coins); @@ -305,3 +272,37 @@ Statistics::declare_invalid() { valid = false; } + +std::string +Statistics::coins_to_string(int coins, int total_coins) { + std::ostringstream os; + os << std::min(coins, 999) << "/" << std::min(total_coins, 999); + return os.str(); +} + +std::string +Statistics::frags_to_string(int badguys, int total_badguys) { + std::ostringstream os; + os << std::min(badguys, 999) << "/" << std::min(total_badguys, 999); + return os.str(); +} + +std::string +Statistics::time_to_string(float time) { + int time_csecs = std::min(static_cast(time * 100), 99 * 6000 + 9999); + int mins = (time_csecs / 6000); + int secs = (time_csecs % 6000) / 100; + int cscs = (time_csecs % 6000) % 100; + + std::ostringstream os; + os << std::setw(2) << std::setfill('0') << mins << ":" << std::setw(2) << std::setfill('0') << secs << "." << std::setw(2) << std::setfill('0') << cscs; + return os.str(); +} + +std::string +Statistics::secrets_to_string(int secrets, int total_secrets) { + std::ostringstream os; + os << std::min(secrets, 999) << "/" << std::min(total_secrets, 999); + return os.str(); +} +