Added support for setting up end sequence animations on levels.

[supertux.git] / src / statistics.cpp

diff --git a/src/statistics.cpp b/src/statistics.cpp
index 0aa3f57..52daaa1 100644 (file)
--- a/src/statistics.cpp
+++ b/src/statistics.cpp
@@ -22,6 +22,7 @@
 #include "statistics.h"
 #include "video/drawing_context.h"
 #include "app/gettext.h"
+#include "app/globals.h"
 #include "resources.h"
 
 Statistics global_stats;
@@ -44,6 +45,16 @@ stat_name_to_string(int stat_enum)
     }
 }
 
+int
+my_min(int a, int b)
+{
+if(a == -1)
+  return b;
+if(b == -1)
+  return a;
+return std::min(a, b);
+}
+
 Statistics::Statistics()
 {
   timer.init(true);
@@ -74,9 +85,15 @@ Statistics::write(LispWriter& writer)
 #define TOTAL_DISPLAY_TIME 3400
 #define FADING_TIME         600
 
+#define WMAP_INFO_LEFT_X  555
+#define WMAP_INFO_RIGHT_X 705
+
 void
 Statistics::draw_worldmap_info(DrawingContext& context)
 {
+  if(stats[SCORE_STAT] == -1)  // not initialized yet
+    return;
+
   if(!timer.check())
     {
     timer.start(TOTAL_DISPLAY_TIME);
@@ -95,27 +112,67 @@ Statistics::draw_worldmap_info(DrawingContext& context)
 
   char str[128];
 
-  context.draw_text(white_small_text, _("Level Statistics"), Vector(550, 490), LAYER_GUI);
+  context.draw_text(white_small_text, _("Level Statistics"),
+                    Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 490),
+                    CENTER_ALLIGN, LAYER_GUI);
 
-  sprintf(str, _("Max score: %d"), stats[SCORE_STAT]);
-  context.draw_text(white_small_text, str, Vector(560, 506), LAYER_GUI);
+  sprintf(str, _("Max score:"));
+  context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 506), LEFT_ALLIGN, LAYER_GUI);
+
+  sprintf(str, "%d", stats[SCORE_STAT]);
+  context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 506), RIGHT_ALLIGN, LAYER_GUI);
+
+  // draw other small info
 
   if(display_stat == BADGUYS_SQUISHED_STAT)
-    sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]);
+    sprintf(str, _("Max fragging:"));
   else if(display_stat == SHOTS_STAT)
-    sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]);
+    sprintf(str, _("Min shots:"));
   else if(display_stat == TIME_NEEDED_STAT)
-    sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]);
+    sprintf(str, _("Min time needed:"));
   else// if(display_stat == JUMPS_STAT)
-    sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]);
+    sprintf(str, _("Min jumps:"));
+
+  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(560, 522), LAYER_GUI, NONE_EFFECT, alpha);
+  if(display_stat == BADGUYS_SQUISHED_STAT)
+    sprintf(str, "%d", stats[BADGUYS_SQUISHED_STAT]);
+  else if(display_stat == SHOTS_STAT)
+    sprintf(str, "%d", stats[SHOTS_STAT]);
+  else if(display_stat == TIME_NEEDED_STAT)
+    sprintf(str, "%d", stats[TIME_NEEDED_STAT]);
+  else// if(display_stat == JUMPS_STAT)
+    sprintf(str, "%d", stats[JUMPS_STAT]);
+
+  context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 522), RIGHT_ALLIGN, LAYER_GUI, NONE_EFFECT, alpha);
 }
 
 void
-Statistics::draw_message_info(DrawingContext& context)
+Statistics::draw_message_info(DrawingContext& context, std::string title)
 {
-  // TODO
+  if(stats[SCORE_STAT] == -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]);
+  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 == BADGUYS_SQUISHED_STAT)
+      sprintf(str, _("Max fragging:    %d"), stats[BADGUYS_SQUISHED_STAT]);
+    else if(i == SHOTS_STAT)
+      sprintf(str, _("Min shots:       %d"), stats[SHOTS_STAT]);
+    else if(i == TIME_NEEDED_STAT)
+      sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]);
+    else// if(i == JUMPS_STAT)
+      sprintf(str, _("Min jumps:       %d"), stats[JUMPS_STAT]);
+
+    context.draw_text(white_small_text, str, Vector(screen->w/2, 462 + i*18), CENTER_ALLIGN, LAYER_GUI);
+    }
 }
 
 void
@@ -147,12 +204,13 @@ void
 Statistics::merge(Statistics& stats_)
 {
   stats[SCORE_STAT] = std::max(stats[SCORE_STAT], stats_.stats[SCORE_STAT]);
-  stats[JUMPS_STAT] = std::min(stats[JUMPS_STAT], stats_.stats[JUMPS_STAT]);
+  if(stats[JUMPS_STAT] != -1)
+    stats[JUMPS_STAT] = my_min(stats[JUMPS_STAT], stats_.stats[JUMPS_STAT]);
   stats[BADGUYS_SQUISHED_STAT] =
     std::max(stats[BADGUYS_SQUISHED_STAT], stats_.stats[BADGUYS_SQUISHED_STAT]);
-  stats[SHOTS_STAT] = std::min(stats[SHOTS_STAT], stats_.stats[SHOTS_STAT]);
+  stats[SHOTS_STAT] = my_min(stats[SHOTS_STAT], stats_.stats[SHOTS_STAT]);
   stats[TIME_NEEDED_STAT] =
-    std::min(stats[TIME_NEEDED_STAT], stats_.stats[TIME_NEEDED_STAT]);
+    my_min(stats[TIME_NEEDED_STAT], stats_.stats[TIME_NEEDED_STAT]);
 }
 
 void