#include <assert.h>
#include <math.h>
+#include <sstream>
+#include <limits>
#include "video/drawing_context.hpp"
#include "gettext.hpp"
+#include "lisp/writer.hpp"
#include "lisp/lisp.hpp"
#include "resources.hpp"
#include "main.hpp"
const int nv_coins = std::numeric_limits<int>::min();
const int nv_badguys = std::numeric_limits<int>::min();
const float nv_time = std::numeric_limits<float>::max();
+ const int nv_secrets = std::numeric_limits<int>::min();
}
-Statistics::Statistics() : coins(nv_coins), total_coins(nv_coins), badguys(nv_badguys), total_badguys(nv_badguys), time(nv_time), 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), 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()
reader.get("badguys-killed", badguys);
reader.get("badguys-killed-total", total_badguys);
reader.get("time-needed", time);
+ reader.get("secrets-found", secrets);
+ reader.get("secrets-found-total", total_secrets);
}
void
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);
}
//define TOTAL_DISPLAY_TIME 3400
#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)
{
// 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);
+ // 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), ALIGN_CENTER, LAYER_GUI);
float alpha;
if(timer.get_timegone() < FADING_TIME)
char caption_buf[128];
char stat_buf[128];
- switch (display_stat)
+ switch (display_stat)
{
case 0:
- sprintf(caption_buf, _("Max coins collected:"));
- sprintf(stat_buf, "%d/%d", coins, total_coins);
+ snprintf(caption_buf, sizeof(caption_buf), _("Max coins collected:"));
+ snprintf(stat_buf, sizeof(stat_buf), "%d/%d", coins, total_coins);
break;
case 1:
- sprintf(caption_buf, _("Max fragging:"));
- sprintf(stat_buf, "%d/%d", badguys, total_badguys);
+ snprintf(caption_buf, sizeof(caption_buf), _("Max fragging:"));
+ snprintf(stat_buf, sizeof(stat_buf), "%d/%d", badguys, total_badguys);
break;
case 2:
- sprintf(caption_buf, _("Min time needed:"));
+ snprintf(caption_buf, sizeof(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);
+ 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;
{
timer.start(TOTAL_DISPLAY_TIME);
display_stat++;
- if (display_stat > 2) display_stat = 0;
+ if (display_stat > 3) display_stat = 0;
}
- 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.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();
}
// 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);
+ // 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;
- char str[128];
+ context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), ALIGN_CENTER, LAYER_GUI);
+
+ char stat_buf[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);
+ snprintf(stat_buf, sizeof(stat_buf), "%d/%d", coins, total_coins);
+ 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;
- 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);
+ snprintf(stat_buf, sizeof(stat_buf), "%d/%d", badguys, total_badguys);
+ 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;
- 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);
+ 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), 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
// 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;
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;
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, 128, "%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, 128, "%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, "Badguys", Vector(col1_x, row4_y), LEFT_ALLIGN, LAYER_GUI);
- snprintf(buf, 128, "%d/%d", badguys, total_badguys);
- context.draw_text(gold_text, buf, Vector(col2_x, row4_y), LEFT_ALLIGN, LAYER_GUI);
- if (best_stats && (best_stats->badguys > badguys)) {
- snprintf(buf, 128, "%d/%d", best_stats->badguys, best_stats->total_badguys);
+ 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), 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, 128, "%02d:%02d", mins,secs);
- context.draw_text(gold_text, buf, Vector(col2_x, row3_y), LEFT_ALLIGN, LAYER_GUI);
+ snprintf(buf, sizeof(buf), "%02d:%02d", mins,secs);
+ 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, 128, "%02d:%02d", mins,secs);
+ 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;
+ coins = 0;
+ badguys = 0;
+ time = 0;
+ secrets = 0;
}
void
Statistics::merge(Statistics& s2)
{
+ if (!s2.valid) return;
coins = std::max(coins, s2.coins);
total_coins = s2.total_coins;
badguys = std::max(badguys, s2.badguys);
total_badguys = s2.total_badguys;
time = std::min(time, s2.time);
+ secrets = std::max(secrets, s2.secrets);
+ total_secrets = s2.total_secrets;
}
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;
if (s2.total_badguys != nv_badguys) total_badguys += s2.total_badguys;
if (s2.time != nv_time) time += s2.time;
+ 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;
}
projects / supertux.git / blobdiff