X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameloop.cpp;h=790b8afdb0d9a510addb5abc6fe53e1a44928ffe;hb=ff8e7dfe9011afc8bdd4ca29b6a6306737d75689;hp=5a5aab02586e22b6c8b433ce4b021efc410998db;hpb=bab71f8f0b31552c94a6127398826fa4446060ad;p=supertux.git

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 5a5aab025..790b8afdb 100644
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -20,16 +20,16 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <errno.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
+#include <cerrno>
 #include <unistd.h>
-#include <math.h>
-#include <time.h>
-#include <SDL.h>
+#include <ctime>
+
+#include "SDL.h"
 
 #ifndef WIN32
 #include <sys/types.h>
@@ -698,7 +698,7 @@ GameSession::drawstatus(DrawingContext& context)
 {
   char str[60];
   
-  snprintf(str, 60, "%d", player_status.score);
+  snprintf(str, 60, " %d", player_status.score);
   context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1);
   context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1);
 
@@ -712,23 +712,20 @@ GameSession::drawstatus(DrawingContext& context)
     context.draw_text_center(white_text, _("TIME's UP"), Vector(0, 0),
         LAYER_FOREGROUND1);
   } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
-    sprintf(str, "%d", time_left.get_left() / 1000 );
+    sprintf(str, " %d", time_left.get_left() / 1000 );
     context.draw_text_center(white_text, _("TIME"),
         Vector(0, 0), LAYER_FOREGROUND1);
     context.draw_text_center(gold_text, str,
         Vector(4*16, 0), LAYER_FOREGROUND1);
   }
 
-  sprintf(str, "%d", player_status.distros);
+  sprintf(str, " %d", player_status.distros);
   context.draw_text(white_text, _("COINS"),
-      Vector(screen->w - white_text->get_text_width(_("COINS"))+white_text->get_text_width(str), 0),
+      Vector(screen->w - white_text->get_text_width(_("COINS"))-white_text->get_text_width("   99"), 0),
         LAYER_FOREGROUND1);
   context.draw_text(gold_text, str,
-      Vector(screen->w - gold_text->get_text_width("99"), 0),LAYER_FOREGROUND1);
+      Vector(screen->w - gold_text->get_text_width(" 99"), 0),LAYER_FOREGROUND1);
 
-  context.draw_text(white_text, _("LIVES"),
-      Vector(screen->w - white_text->get_text_width(_("LIVES"))+white_text->get_text_width(str), 20),
-      LAYER_FOREGROUND1);
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
@@ -745,6 +742,18 @@ GameSession::drawstatus(DrawingContext& context)
             LAYER_FOREGROUND1);
     }
 
+  context.draw_text(white_text, _("LIVES"),
+      Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width("   99"), 20),
+      LAYER_FOREGROUND1);
+
+  if(game_pause)
+    {
+      sprintf(str, _("Playing: %s"), level->name.c_str());
+
+      context.draw_text(white_text, str, Vector(0,20),
+          LAYER_FOREGROUND1);
+    }
+
   if(show_fps)
     {
       sprintf(str, "%2.1f", fps_fps);