[Pingus-CVS] r2945 - in branches/pingus_sdl: . src/worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-16 03:30:48 +0200 (Thu, 16 Aug 2007)
New Revision: 2945

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/worldmap/level_dot.cpp
   branches/pingus_sdl/src/worldmap/manager.cpp
Log:
- some little finetuning on the text on the worldmap
- more issues on the TODO

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-15 22:44:23 UTC (rev 2944)
+++ branches/pingus_sdl/TODO    2007-08-16 01:30:48 UTC (rev 2945)
@@ -65,6 +65,10 @@
 
 - lacks background: data/levels/tutorial/snow10-grumbel.pingus
 
+- finishing the last level doesn't show the credits screen after the story
+
+- data recorder writes out xml, should s-expr
+
 Nice to Have:
 =============
 

Modified: branches/pingus_sdl/src/worldmap/level_dot.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/level_dot.cpp      2007-08-15 22:44:23 UTC 
(rev 2944)
+++ branches/pingus_sdl/src/worldmap/level_dot.cpp      2007-08-16 01:30:48 UTC 
(rev 2945)
@@ -144,7 +144,7 @@
       
       gc.print_center(Fonts::pingus_small,
                       pos.x - (float)pos_correction,
-                      pos.y - 40,
+                      pos.y - 44,
                       _(get_plf().get_levelname()), 
                       10000);
     }

Modified: branches/pingus_sdl/src/worldmap/manager.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/manager.cpp        2007-08-15 22:44:23 UTC 
(rev 2944)
+++ branches/pingus_sdl/src/worldmap/manager.cpp        2007-08-16 01:30:48 UTC 
(rev 2945)
@@ -104,7 +104,7 @@
 WorldMapManagerCreditsButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
-  gc.print_left(Fonts::chalk_small, (float)(Display::get_width() - 150 + 15), 
5, _("Show Ending?"));
+  gc.print_left(Fonts::chalk_small, (float)(Display::get_width() - 150 + 15), 
2, _("Show Ending?"));
 }
 
 void
@@ -135,7 +135,7 @@
 WorldMapManagerStoryButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
-  gc.print_left(Fonts::chalk_small, 18, 5, _("Show Story"));
+  gc.print_left(Fonts::chalk_small, 18, 2, _("Show Story?"));
 }
 
 void
@@ -164,7 +164,7 @@
 WorldMapManagerCloseButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
-  gc.print_left(Fonts::chalk_small, 24, (float)Display::get_height() - 24, 
_("Leave"));
+  gc.print_left(Fonts::chalk_small, 24, (float)Display::get_height() - 25, 
_("Leave?"));
 }
 
 void
@@ -203,7 +203,7 @@
       SurfaceButton::draw(gc);
       gc.print_right(Fonts::chalk_small,
                     (float)Display::get_width() - 40,
-                    (float)Display::get_height() - 24,
+                    (float)Display::get_height() - 25,
                     _("Enter"));
     }
 }
@@ -366,7 +366,7 @@
           Vector3f(gc.get_width()/2 - levelname_bg.get_width()/2,
                    gc.get_height() - levelname_bg.get_height()));
 
-  gc.print_center(Fonts::chalk_small, gc.get_width()/2, gc.get_height() - 20,
+  gc.print_center(Fonts::chalk_small, gc.get_width()/2, gc.get_height() - 25,
                   worldmap->get_levelname());
 }