projects / supertux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
renamed all .h to .hpp
[supertux.git] / src / statistics.cpp
diff --git a/src/statistics.cpp b/src/statistics.cpp
index 986138b..44c6bf0 100644 (file)
--- a/src/statistics.cpp
+++ b/src/statistics.cpp
@@ -17,13 +17,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "statistics.h"
-#include "video/drawing_context.h"
-#include "app/gettext.h"
-#include "app/globals.h"
-#include "resources.h"
+#include <config.h>
+
+#include "video/drawing_context.hpp"
+#include "gettext.hpp"
+#include "lisp/lisp.hpp"
+#include "resources.hpp"
+#include "main.hpp"
+#include "statistics.hpp"
 
 Statistics global_stats;
 
@@ -56,7 +57,6 @@ return std::min(a, b);
 
 Statistics::Statistics()
 {
-  timer.init(true);
   display_stat = 1;
 
   for(int i = 0; i < NUM_STATS; i++)
@@ -69,30 +69,28 @@ 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]);
-    }
+  for(int i = 0; i < NUM_STATS; i++) {
+    reader.get(stat_name_to_string(i).c_str(), stats[i][SPLAYER]);
+    reader.get((stat_name_to_string(i) + "-total").c_str(), stats[i][STOTAL]);
+  }
 }
 
 void
-Statistics::write(LispWriter& writer)
+Statistics::write(lisp::Writer& writer)
 {
-  for(int i = 0; i < NUM_STATS; i++)
-    {
+  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]);
-    }
+  }
 }
 
 #define TOTAL_DISPLAY_TIME 3400
 #define FADING_TIME         600
 
-#define WMAP_INFO_LEFT_X  540
-#define WMAP_INFO_RIGHT_X 720
+#define WMAP_INFO_LEFT_X  520
+#define WMAP_INFO_RIGHT_X 740
 
 void
 Statistics::draw_worldmap_info(DrawingContext& context)
@@ -100,7 +98,7 @@ Statistics::draw_worldmap_info(DrawingContext& context)
   if(stats[SCORE_STAT][SPLAYER] == -1)  // not initialized yet
     return;
 
-  if(!timer.check())
+  if(timer.check())
     {
     timer.start(TOTAL_DISPLAY_TIME);
     display_stat++;
@@ -108,28 +106,31 @@ Statistics::draw_worldmap_info(DrawingContext& context)
       display_stat = 1;
     }
 
-  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;
-  else
-    alpha = 255;
-
   char str[128];
 
-  context.draw_text(white_small_text, _("Best Level Statistics"),
-                    Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 490),
+  context.draw_text(white_small_text, _("- Best Level Statistics -"),
+                    Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 470),
                     CENTER_ALLIGN, LAYER_GUI);
 
   sprintf(str, _("Max score:"));
-  context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 506), LEFT_ALLIGN, LAYER_GUI);
+  context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI);
 
   sprintf(str, "%d", stats[SCORE_STAT][SPLAYER]);
-  context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 506), RIGHT_ALLIGN, LAYER_GUI);
+  context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_ALLIGN, LAYER_GUI);
 
   // draw other small info
 
+  int alpha;
+  if(timer.get_timegone() < FADING_TIME)
+    alpha = int(timer.get_timegone() * 255 / FADING_TIME);
+  else if(timer.get_timeleft() < FADING_TIME)
+    alpha = int(timer.get_timeleft() * 255 / FADING_TIME);
+  else
+    alpha = 255;
+
+  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)
@@ -137,7 +138,7 @@ Statistics::draw_worldmap_info(DrawingContext& context)
   else// if(display_stat == TIME_NEEDED_STAT)
     sprintf(str, _("Min time needed:"));
 
-  context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 522), LEFT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha);
+  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],
@@ -149,7 +150,9 @@ Statistics::draw_worldmap_info(DrawingContext& context)
     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, 522), RIGHT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha);
+  context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 508), RIGHT_ALLIGN, LAYER_GUI);
+
+  context.pop_transform();
 }
 
 void
@@ -158,26 +161,30 @@ 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);
+  context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/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);
+  sprintf(str, _(    "Max score:             %d"), stats[SCORE_STAT][SPLAYER]);
+  context.draw_text(white_text, str, Vector(SCREEN_WIDTH/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"), ((float)stats[COINS_COLLECTED_STAT][SPLAYER] /
-                                                 (float)stats[COINS_COLLECTED_STAT][STOTAL]) * 100);
+      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"), ((float)stats[BADGUYS_KILLED_STAT][SPLAYER] /
-                                                 (float)stats[BADGUYS_KILLED_STAT][STOTAL]) * 100);
+      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"), ((float)stats[TIME_NEEDED_STAT][SPLAYER] /
-                                                 (float)stats[TIME_NEEDED_STAT][STOTAL]) * 100);
+      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);
+    context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI);
     }
 }
 
@@ -232,7 +239,7 @@ Statistics::operator+=(const Statistics& stats_)
 {
   for(int i = 0; i < NUM_STATS; i++)
     {
-    if(stats_.stats[i][STOTAL] == -1)
+    if(stats_.stats[i][SPLAYER] == -1)
       continue;
     stats[i][SPLAYER] += stats_.stats[i][SPLAYER];
     if(stats_.stats[i][STOTAL] != -1)
SVN import of the official repository.