Tweaked pause level name text.

[supertux.git] / src / gameloop.cpp

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 651d39a..60aa305 100644 (file)
--- 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>
@@ -522,6 +522,18 @@ GameSession::draw()
           Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1);
       context->draw_text_center(blue_text, _("PAUSE - Press 'P' To Play"),
           Vector(0, 230), LAYER_FOREGROUND1+2);
+
+      char str1[60];
+      char str2[124];
+      sprintf(str1, _("Playing: "));
+      sprintf(str2, level->name.c_str());
+
+      context->draw_text(blue_text, str1,
+          Vector((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2, 340),
+          LAYER_FOREGROUND1+2);
+      context->draw_text(white_text, str2,
+          Vector(((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2)+blue_text->get_text_width(str1), 340),
+          LAYER_FOREGROUND1+2);
     }
 
   if(Menu::current())
@@ -698,7 +710,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);
 
@@ -721,14 +733,11 @@ GameSession::drawstatus(DrawingContext& context)
 
   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);
 
-  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 +754,10 @@ 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(show_fps)
     {
       sprintf(str, "%2.1f", fps_fps);