X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fstatistics.hpp;h=c1fc04005f976f6967da77de1cfc691a26a6a34c;hb=24dee16ba721c757b53c3cca08951c867b49c6a7;hp=5419f5bca02c38d1a7cdc05ae4c7fdaa0cfa4a35;hpb=f17ff6d7a4ebb176f264e037b12ab8adfbeb3846;p=supertux.git

diff --git a/src/statistics.hpp b/src/statistics.hpp
index 5419f5bca..c1fc04005 100644
--- a/src/statistics.hpp
+++ b/src/statistics.hpp
@@ -22,17 +22,18 @@
 #ifndef SUPERTUX_STATISTICS_H
 #define SUPERTUX_STATISTICS_H
 
-#include "timer.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
-#include "video/surface.hpp"
-#include "video/drawing_context.hpp"
+#include <squirrel.h>
+
+namespace lisp { class Writer; }
+namespace lisp { class Lisp; }
+class Surface;
+class DrawingContext;
 
 /** This class is a layer between level and worldmap to keep
  *  track of stuff like scores, and minor, but funny things, like
  *  number of jumps and stuff */
 class Statistics
-{ 
+{
 public:
   int coins; /**< coins collected */
   int total_coins; /**< coins in level */
@@ -47,14 +48,25 @@ public:
   ~Statistics();
 
   /// read statistics from lisp file
-  void parse(const lisp::Lisp& lisp);
+  //void parse(const lisp::Lisp& lisp);
   /// write statistics to lisp file
-  void write(lisp::Writer& writer);
+  //void write(lisp::Writer& writer);
+
+  /**
+   * serialize statistics object as squirrel table "statistics"
+   */
+  void serialize_to_squirrel(HSQUIRRELVM vm);
+
+  /**
+   * unserialize statistics object from squirrel table "statistics"
+   */
+  void unserialize_from_squirrel(HSQUIRRELVM vm);
 
   void draw_worldmap_info(DrawingContext& context); /**< draw worldmap stat HUD */
   void draw_message_info(DrawingContext& context, std::string title); /**< draw stats at level start */
   void draw_endseq_panel(DrawingContext& context, Statistics* best_stats, Surface* backdrop); /**< draw panel shown during level's end sequence */
 
+  void zero(); /**< Set stats to zero */
   void reset(); /**< Set stats (but not totals) to zero */
   void merge(Statistics& stats); /**< Given another Statistics object finds the best of each one */
   void operator+=(const Statistics& o); /**< Add two Statistics objects */
@@ -63,8 +75,11 @@ public:
 
 private:
   bool valid; /**< stores whether this statistics can be trusted */
-  Timer timer; /**< for draw_worldmap_info: time until switching to next stat */
-  int display_stat; /**< for draw_worldmap_info: which stat is currently displayed */
+
+  std::string coins_to_string(int coins, int total_coins) const;
+  std::string frags_to_string(int badguys, int total_badguys) const;
+  std::string time_to_string(float time) const;
+  std::string secrets_to_string(int secrets, int total_secrets) const;
 };
 
 #endif /*SUPERTUX_STATISTICS_H*/