X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fstatistics.hpp;h=5419f5bca02c38d1a7cdc05ae4c7fdaa0cfa4a35;hb=34358bd66972e94745ccd8e8eecc67cff739f883;hp=08488e67352f6c6a7474efc35a650b21ae31b770;hpb=d5a14290ef3ba576ce0d6959155a4d45dffddf1f;p=supertux.git

diff --git a/src/statistics.hpp b/src/statistics.hpp
index 08488e673..5419f5bca 100644
--- a/src/statistics.hpp
+++ b/src/statistics.hpp
@@ -2,7 +2,8 @@
 //
 //  SuperTux (Statistics module)
 //  Copyright (C) 2004 Ricardo Cruz <rick2@aeiou.pt>
-//  Copyright (C) 2006 Ondrej Hosek <white.timberwolf@aon.at>
+//  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
@@ -13,7 +14,7 @@
 //  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.
@@ -24,29 +25,25 @@
 #include "timer.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/writer.hpp"
-
-class DrawingContext;
-
-#define SPLAYER 0
-#define STOTAL  1
-
-enum {
-//  SCORE_STAT,
-  COINS_COLLECTED_STAT,
-  BADGUYS_KILLED_STAT,
-  TIME_NEEDED_STAT,
-  NUM_STATS
-};
+#include "video/surface.hpp"
+#include "video/drawing_context.hpp"
 
 /** 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:
-  // don't forget to call reset() to init stat
-  Statistics();
+  int coins; /**< coins collected */
+  int total_coins; /**< coins in level */
+  int badguys; /**< badguys actively killed */
+  int total_badguys; /**< (vincible) badguys in level */
+  float time; /**< seconds needed */
+  int secrets; /**< secret areas found */
+  int total_secrets; /**< secret areas in level */
+
+public:
+  Statistics(); /**< Creates new statistics, call reset() before counting */
   ~Statistics();
 
   /// read statistics from lisp file
@@ -54,34 +51,20 @@ public:
   /// write statistics to lisp file
   void write(lisp::Writer& writer);
 
-  /* Draw to the worldmap or a game message */
-  // TODO: make this functions working
-  void draw_worldmap_info(DrawingContext& context);
-  void draw_message_info(DrawingContext& context, std::string title);
-
-  /* Add / Set / Get points to/from one of the stats this can keep track of */
-  void add_points(int stat, int points);
-  void set_points(int stat, int points);
-  int get_points(int stat);
-
-  void set_total_points(int stat, int points);
+  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 */
 
-  /* Reset statistics */
-  void reset();
+  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 */
 
-  /* Give another Statistics object, find the best of each one */
-  void merge(Statistics& stats);
-
-  /* Add two statistic objects */
-  void operator+=(const Statistics& o);
+  void declare_invalid(); /**< marks statistics as invalid for their entire lifetime (e.g. after cheating). Invalid statistics will not be merged or drawn. */
 
 private:
-  int stats[NUM_STATS][2];
-
-  Timer timer;
-  int display_stat;
+  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 */
 };
 
-extern Statistics global_stats;
-
 #endif /*SUPERTUX_STATISTICS_H*/