+// $Id$
//
-// SuperTux - A Jump'n Run
+// SuperTux (Statistics module)
// Copyright (C) 2004 Ricardo Cruz <rick2@aeiou.pt>
+// Copyright (C) 2006 Ondrej Hosek <ondra.hosek@gmail.com>
+// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// 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.
-
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "video/drawing_context.h"
-#include "app/gettext.h"
-#include "app/globals.h"
-#include "resources.h"
-#include "statistics.h"
-
-Statistics global_stats;
-
-std::string
-stat_name_to_string(int stat_enum)
-{
- switch(stat_enum)
- {
- case SCORE_STAT:
- return "score";
- case COINS_COLLECTED_STAT:
- return "coins-collected";
- case BADGUYS_KILLED_STAT:
- return "badguys-killed";
- case TIME_NEEDED_STAT:
- return "time-needed";;
- }
- return "";
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <config.h>
+
+#include <assert.h>
+#include <math.h>
+#include <sstream>
+#include "video/drawing_context.hpp"
+#include "gettext.hpp"
+#include "lisp/lisp.hpp"
+#include "resources.hpp"
+#include "main.hpp"
+#include "statistics.hpp"
+#include "log.hpp"
+
+namespace {
+ 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();
}
-int
-my_min(int a, int b)
+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)
{
-if(a == -1)
- return b;
-if(b == -1)
- return a;
-return std::min(a, b);
-}
-
-Statistics::Statistics()
-{
- timer.init(true);
- display_stat = 1;
-
- for(int i = 0; i < NUM_STATS; i++)
- for(int j = 0; j < 2; j++)
- stats[i][j] = -1;
}
Statistics::~Statistics()
}
void
-Statistics::parse(LispReader& reader)
+Statistics::parse(const lisp::Lisp& reader)
{
- for(int i = 0; i < NUM_STATS; i++)
- {
- reader.read_int(stat_name_to_string(i).c_str(), stats[i][SPLAYER]);
- reader.read_int((stat_name_to_string(i) + "-total").c_str(), stats[i][STOTAL]);
- }
+ reader.get("coins-collected", coins);
+ reader.get("coins-collected-total", total_coins);
+ 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
-Statistics::write(LispWriter& writer)
+Statistics::write(lisp::Writer& writer)
{
- for(int i = 0; i < NUM_STATS; i++)
- {
- writer.write_int(stat_name_to_string(i), stats[i][SPLAYER]);
- writer.write_int(stat_name_to_string(i) + "-total", stats[i][STOTAL]);
- }
+ 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);
}
-#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
+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)
{
- if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet
- return;
-
- if(!timer.check())
- {
- timer.start(TOTAL_DISPLAY_TIME);
- display_stat++;
- if(display_stat >= NUM_STATS)
- display_stat = 1;
- }
-
- char str[128];
-
- 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 level was never played
+ if (coins == nv_coins) return;
- sprintf(str, _("Max score:"));
- context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI);
+ // skip draw if stats were declared invalid
+ if (!valid) return;
- sprintf(str, "%d", stats[SCORE_STAT][SPLAYER]);
- context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_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), CENTER_ALLIGN, LAYER_GUI);
- // draw other small info
-
- int alpha;
- if(timer.get_gone() < FADING_TIME)
- alpha = timer.get_gone() * 255 / FADING_TIME;
- else if(timer.get_left() < FADING_TIME)
- alpha = timer.get_left() * 255 / FADING_TIME;
+ 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 = 255;
+ alpha = 1.0f;
context.push_transform();
context.set_alpha(alpha);
- if(display_stat == COINS_COLLECTED_STAT)
- sprintf(str, _("Max coins collected:"));
- else if(display_stat == BADGUYS_KILLED_STAT)
- sprintf(str, _("Max fragging:"));
- 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);
-
- if(display_stat == COINS_COLLECTED_STAT)
- sprintf(str, "%d/%d", stats[COINS_COLLECTED_STAT][SPLAYER],
- stats[COINS_COLLECTED_STAT][STOTAL]);
- else if(display_stat == BADGUYS_KILLED_STAT)
- sprintf(str, "%d/%d", stats[BADGUYS_KILLED_STAT][SPLAYER],
- stats[BADGUYS_KILLED_STAT][STOTAL]);
- else// if(display_stat == TIME_NEEDED_STAT)
- 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);
+ 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;
+ }
+
+ if (!timer.started())
+ {
+ timer.start(TOTAL_DISPLAY_TIME);
+ display_stat++;
+ 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.pop_transform();
}
void
Statistics::draw_message_info(DrawingContext& context, std::string title)
{
- if(stats[SCORE_STAT][SPLAYER] == -1) // not initialized yet
- return;
-
- context.draw_text(gold_text, title, Vector(screen->w/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->w/2, 450), CENTER_ALLIGN, LAYER_GUI);
-
- for(int i = 1; i < NUM_STATS; i++)
- {
- if(i == COINS_COLLECTED_STAT)
- sprintf(str, _("Max coins collected: %d / %d"),
- stats[COINS_COLLECTED_STAT][SPLAYER],
- stats[COINS_COLLECTED_STAT][STOTAL]);
- else if(i == BADGUYS_KILLED_STAT)
- sprintf(str, _("Max fragging: %d / %d"),
- stats[BADGUYS_KILLED_STAT][SPLAYER],
- stats[BADGUYS_KILLED_STAT][STOTAL]);
- else// if(i == TIME_NEEDED_STAT)
- sprintf(str, _("Min time needed: %d / %d"),
- stats[TIME_NEEDED_STAT][SPLAYER],
- stats[TIME_NEEDED_STAT][STOTAL]);
-
-
- context.draw_text(white_small_text, str, Vector(screen->w/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI);
- }
+ // 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;
}
void
-Statistics::add_points(int stat, int points)
+Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, Surface* backdrop)
{
- stats[stat][SPLAYER] += points;
-}
-
-int
-Statistics::get_points(int stat)
-{
- return stats[stat][SPLAYER];
+ // 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 = 160+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_w = (int)backdrop->get_width();
+ int bd_h = (int)backdrop->get_height();
+ int bd_x = (int)((SCREEN_WIDTH - bd_w) / 2);
+ 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 row1_y = box_y;
+ int row2_y = row1_y+30;
+ int row3_y = row2_y+20;
+ int row4_y = row3_y+20;
+
+ context.draw_surface(backdrop, Vector(bd_x, bd_y), LAYER_GUI);
+
+ 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, sizeof(buf), "%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, sizeof(buf), "%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(white_text, _("Secrets"), Vector(col1_x, row4_y), LEFT_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(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, 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::set_points(int stat, int points)
-{
- stats[stat][SPLAYER] = points;
-}
-
-void
-Statistics::set_total_points(int stat, int points)
+Statistics::reset()
{
- stats[stat][STOTAL] = points;
+ coins = 0;
+ badguys = 0;
+ time = 0;
+ secrets = 0;
}
void
-Statistics::reset()
+Statistics::merge(Statistics& s2)
{
- for(int i = 0; i < NUM_STATS; i++)
- stats[i][SPLAYER] = 0;
+ 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::merge(Statistics& stats_)
+Statistics::operator+=(const Statistics& s2)
{
- 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]);
- stats[TIME_NEEDED_STAT][SPLAYER] =
- my_min(stats[TIME_NEEDED_STAT][SPLAYER], stats_.stats[TIME_NEEDED_STAT][SPLAYER]);
-
- stats[COINS_COLLECTED_STAT][STOTAL] = stats_.stats[COINS_COLLECTED_STAT][STOTAL];
- stats[BADGUYS_KILLED_STAT][STOTAL] = stats_.stats[BADGUYS_KILLED_STAT][STOTAL];
- stats[TIME_NEEDED_STAT][STOTAL] = stats_.stats[TIME_NEEDED_STAT][STOTAL];
+ 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::operator+=(const Statistics& stats_)
+Statistics::declare_invalid()
{
- for(int i = 0; i < NUM_STATS; i++)
- {
- if(stats_.stats[i][SPLAYER] == -1)
- continue;
- stats[i][SPLAYER] += stats_.stats[i][SPLAYER];
- if(stats_.stats[i][STOTAL] != -1)
- stats[i][STOTAL] += stats_.stats[i][STOTAL];
- }
+ valid = false;
}
projects / supertux.git / blobdiff