Addded property to Worldmap Spawnpoint to let Tux automatically start walking (or...

[supertux.git] / src / statistics.cpp

diff --git a/src/statistics.cpp b/src/statistics.cpp
index 652da58..5655587 100644 (file)
--- a/src/statistics.cpp
+++ b/src/statistics.cpp
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <math.h>
+#include <sstream>
 #include "video/drawing_context.hpp"
 #include "gettext.hpp"
 #include "lisp/lisp.hpp"
@@ -80,15 +81,6 @@ 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;
 
-namespace {
-  inline const char* chain(const char* c1, const char* c2) {
-    return (std::string(c1) + std::string(c2)).c_str();
-  }
-  inline const char* chain(const char* c1, const char* c2, const char* c3) {
-    return (std::string(c1) + std::string(c2) + std::string(c3)).c_str();
-  }
-}
-
 void
 Statistics::draw_worldmap_info(DrawingContext& context)
 {
@@ -98,7 +90,7 @@ Statistics::draw_worldmap_info(DrawingContext& context)
   // skip draw if stats were declared invalid
   if (!valid) return;
 
-  context.draw_text(white_small_text, ::chain("- ", _("Best Level Statistics"), " -"), Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, WMAP_INFO_TOP_Y1), CENTER_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);
 
   float alpha;
   if(timer.get_timegone() < FADING_TIME)
@@ -113,7 +105,7 @@ Statistics::draw_worldmap_info(DrawingContext& context)
 
   char caption_buf[128];
   char stat_buf[128];
-  switch (display_stat) 
+  switch (display_stat)
   {
     case 0:
       snprintf(caption_buf, sizeof(caption_buf), _("Max coins collected:"));
@@ -129,7 +121,7 @@ Statistics::draw_worldmap_info(DrawingContext& context)
        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); 
+       snprintf(stat_buf, sizeof(stat_buf), "%02d:%02d", mins,secs);
       }
       break;
     case 3:
@@ -173,30 +165,30 @@ Statistics::draw_message_info(DrawingContext& context, std::string title)
   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); 
+  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); 
+  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); 
+  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); 
+  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 
+void
 Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, Surface* backdrop)
 {
   // skip draw if level was never played
@@ -209,7 +201,7 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S
   // abort if we have no backdrop
   if (!backdrop) return;
 
-  int box_w = 160+110+110;
+  int box_w = 220+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;
@@ -220,29 +212,32 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S
   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 col2_x = col1_x+200;
+  int col3_x = col2_x+130;
 
   int row1_y = box_y;
   int row2_y = row1_y+30;
   int row3_y = row2_y+20;
   int row4_y = row3_y+20;
 
+  context.push_transform();
+  context.set_alpha(0.5);
   context.draw_surface(backdrop, Vector(bd_x, bd_y), LAYER_GUI);
+  context.pop_transform();
 
   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(white_text, _("Coins"), Vector(col2_x-16, row2_y), RIGHT_ALLIGN, LAYER_GUI);
+  snprintf(buf, sizeof(buf), "%d/%d", std::min(coins, 999), std::min(total_coins, 999));
   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);
+    snprintf(buf, sizeof(buf), "%d/%d", std::min(best_stats->coins, 999), std::min(best_stats->total_coins, 999));
   }
   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);
+  context.draw_text(white_text, _("Secrets"), Vector(col2_x-16, row4_y), RIGHT_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)) {
@@ -250,7 +245,7 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S
   }
   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);
+  context.draw_text(white_text, _("Time"), Vector(col2_x-16, row3_y), RIGHT_ALLIGN, LAYER_GUI);
   int csecs = (int)(time * 100);
   int mins = (int)(csecs / 6000);
   int secs = (csecs % 6000) / 100;
@@ -268,10 +263,10 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S
 void
 Statistics::reset()
 {
-  coins = 0; 
-  badguys = 0; 
-  time = 0; 
-  secrets = 0; 
+  coins = 0;
+  badguys = 0;
+  time = 0;
+  secrets = 0;
 }
 
 void
@@ -305,4 +300,3 @@ Statistics::declare_invalid()
 {
   valid = false;
 }
-