X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fstatistics.cpp;h=285a3575bc72998ba0c0dd07efd8aec9dd48bdfc;hb=5667d7e94d85f968ab914bc457edd689fc907253;hp=d08f7b0d870059def62424a38ed1e1938531fd43;hpb=244488950ba1c0daf20795213619c27e6963937c;p=supertux.git diff --git a/src/statistics.cpp b/src/statistics.cpp index d08f7b0d8..285a3575b 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -22,13 +22,18 @@ #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(); @@ -37,14 +42,24 @@ namespace { const int nv_secrets = std::numeric_limits::min(); } -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), display_stat(0) +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) { + 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() { } +/* void Statistics::parse(const lisp::Lisp& reader) { @@ -60,127 +75,110 @@ Statistics::parse(const lisp::Lisp& reader) void Statistics::write(lisp::Writer& writer) { - writer.write_int("coins-collected", coins); - writer.write_int("coins-collected-total", total_coins); - writer.write_int("badguys-killed", badguys); - writer.write_int("badguys-killed-total", total_badguys); - writer.write_float("time-needed", time); - writer.write_int("secrets-found", secrets); - writer.write_int("secrets-found-total", total_secrets); + writer.write("coins-collected", coins); + writer.write("coins-collected-total", total_coins); + writer.write("badguys-killed", badguys); + writer.write("badguys-killed-total", total_badguys); + writer.write("time-needed", time); + writer.write("secrets-found", secrets); + writer.write("secrets-found-total", total_secrets); } - -//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 +*/ 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; - - context.draw_text(white_small_text, _("- Best Level Statistics -"), Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 470), 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: - sprintf(caption_buf, _("Max coins collected:")); - sprintf(stat_buf, "%d/%d", coins, total_coins); - break; - case 1: - sprintf(caption_buf, _("Max fragging:")); - sprintf(stat_buf, "%d/%d", badguys, total_badguys); - break; - case 2: - sprintf(caption_buf, _("Min time needed:")); - { - int csecs = (int)(time * 100); - int mins = (int)(csecs / 6000); - int secs = (csecs % 6000) / 100; - sprintf(stat_buf, "%02d:%02d", mins,secs); - } - break; - case 3: - sprintf(caption_buf, _("Max secrets found:")); - sprintf(stat_buf, "%d/%d", secrets, total_secrets); - 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, 490), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_small_text, stat_buf, Vector(WMAP_INFO_RIGHT_X, 490), 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; - context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), CENTER_ALLIGN, LAYER_GUI); - - char str[128]; - int py = 450 + 18; - - sprintf(str, _("Max coins collected: %d / %d"), coins, total_coins); - context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, py), CENTER_ALLIGN, LAYER_GUI); - py+=18; - - sprintf(str, _("Max fragging: %d / %d"), badguys, total_badguys); - context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, py), CENTER_ALLIGN, LAYER_GUI); - py+=18; - - int csecs = (int)(time * 100); - int mins = (int)(csecs / 6000); - int secs = (csecs % 6000) / 100; - sprintf(str, _("Min time needed: %02d:%02d"), mins,secs); - context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, py), CENTER_ALLIGN, LAYER_GUI); - py+=18; - - sprintf(str, _("Max secrets found: %d / %d"), secrets, total_secrets); - context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, py), CENTER_ALLIGN, LAYER_GUI); - py+=18; + // skip draw if stats were declared invalid + if (!valid) return; + + 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 +void Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, Surface* backdrop) { // 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; + // abort if we have no backdrop if (!backdrop) return; - int box_w = 130+130+130; + 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; @@ -191,7 +189,7 @@ 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+130; + int col2_x = col1_x+200; int col3_x = col2_x+130; int row1_y = box_y; @@ -199,55 +197,54 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S 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, "Coins", Vector(col1_x, row2_y), LEFT_ALLIGN, LAYER_GUI); - snprintf(buf, 128, "%d/%d", coins, total_coins); - context.draw_text(gold_text, buf, Vector(col2_x, row2_y), LEFT_ALLIGN, LAYER_GUI); - if (best_stats && (best_stats->coins > coins)) { - snprintf(buf, 128, "%d/%d", best_stats->coins, best_stats->total_coins); - } - 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(col1_x, row4_y), LEFT_ALLIGN, LAYER_GUI); - snprintf(buf, 128, "%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, 128, "%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(col1_x, row3_y), LEFT_ALLIGN, LAYER_GUI); - int csecs = (int)(time * 100); - int mins = (int)(csecs / 6000); - int secs = (csecs % 6000) / 100; - snprintf(buf, 128, "%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, 128, "%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 Statistics::reset() { - coins = 0; - badguys = 0; - time = 0; - secrets = 0; + coins = 0; + badguys = 0; + time = 0; + secrets = 0; } void -Statistics::merge(Statistics& s2) +Statistics::merge(const Statistics& s2) { + if (!s2.valid) return; coins = std::max(coins, s2.coins); total_coins = s2.total_coins; badguys = std::max(badguys, s2.badguys); @@ -260,6 +257,7 @@ Statistics::merge(Statistics& s2) void Statistics::operator+=(const Statistics& s2) { + if (!s2.valid) return; if (s2.coins != nv_coins) coins += s2.coins; if (s2.total_coins != nv_coins) total_coins += s2.total_coins; if (s2.badguys != nv_badguys) badguys += s2.badguys; @@ -268,3 +266,43 @@ Statistics::operator+=(const Statistics& s2) if (s2.secrets != nv_secrets) secrets += s2.secrets; if (s2.total_secrets != nv_secrets) total_secrets += s2.total_secrets; } + +void +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(); +} +