* Level time now respects top border

* Abednego's 4th Bonus1 level now has its time limit set correctly to 60.

SVN-Revision: 2929

diff --git a/data/levels/bonus1/abednego-level4.stl b/data/levels/bonus1/abednego-level4.stl
index abe58b0..53d03da 100644 (file)
--- a/data/levels/bonus1/abednego-level4.stl
+++ b/data/levels/bonus1/abednego-level4.stl
@@ -84,7 +84,7 @@
       (speed 0.5)
     )
     (leveltime
-      (time 500) ;60)
+      (time 60)
     )
     (particles-snow
       (layer -200)

diff --git a/src/object/level_time.cpp b/src/object/level_time.cpp
index 532afc5..db8f3fa 100644 (file)
--- a/src/object/level_time.cpp
+++ b/src/object/level_time.cpp
@@ -54,14 +54,14 @@ LevelTime::draw(DrawingContext& context)
   char str[60];
     
   if(time_left.get_timeleft() < 0) {
-    context.draw_text(white_text, _("TIME's UP"), Vector(SCREEN_WIDTH/2, 0),
+    context.draw_text(white_text, _("TIME's UP"), Vector(SCREEN_WIDTH/2, BORDER_Y),
         CENTER_ALLIGN, LAYER_FOREGROUND1);
   } else if (time_left.get_timeleft() > TIME_WARNING
       || int(game_time * 2.5) % 2) {
     snprintf(str, sizeof(str), " %d", int(time_left.get_timeleft()));
     context.draw_text(white_text, _("TIME"),
-        Vector(SCREEN_WIDTH/2, 0), CENTER_ALLIGN, LAYER_FOREGROUND1);
-    context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2 + 4*16, 0),
+        Vector(SCREEN_WIDTH/2, BORDER_Y), CENTER_ALLIGN, LAYER_FOREGROUND1);
+    context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2 + 4*16, BORDER_Y),
                       CENTER_ALLIGN, LAYER_FOREGROUND1);
   }