[Pingus-CVS] r3879 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-20 15:18:51 +0200 (Sun, 20 Jul 2008)
New Revision: 3879

Modified:
   trunk/pingus/src/credits.cpp
Log:
Fixed credit screen (button position, clip rect, UTF-8

Modified: trunk/pingus/src/credits.cpp
===================================================================
--- trunk/pingus/src/credits.cpp        2008-07-19 18:11:39 UTC (rev 3878)
+++ trunk/pingus/src/credits.cpp        2008-07-20 13:18:51 UTC (rev 3879)
@@ -27,7 +27,7 @@
 #include "gettext.h"
 #include "display/display.hpp"
 #include "blitter.hpp"
-
+
 class CreditsOkButton
   : public GUI::SurfaceButton
 {
@@ -35,8 +35,8 @@
   Credits* parent;
 public:
   CreditsOkButton(Credits* p)
-    : GUI::SurfaceButton(Display::get_width()/2 + 225,
-                         Display::get_height()/2 + 125,
+    : GUI::SurfaceButton(Display::get_width()/2  + 260,
+                         Display::get_height()/2 + 170,
                          "core/start/ok",
                          "core/start/ok_clicked",
                          "core/start/ok_hover"),
@@ -55,7 +55,7 @@
     Sound::PingusSound::play_sound("yipee");
   }
 };
-
+
 Credits::Credits()
   : background("core/menu/wood"),
     blackboard("core/menu/blackboard"),
@@ -93,9 +93,9 @@
 
   credits.push_back(_("-Porting (Win32)"));
   credits.push_back("_Alberto Curro");
-  credits.push_back("_Bj�rn Christoph Fischer");
-  credits.push_back("_Kenneth Gangst�");
-  credits.push_back("_Michael K�ser");
+  credits.push_back("_Björn Christoph Fischer");
+  credits.push_back("_Kenneth Gangstø");
+  credits.push_back("_Michael Käser");
   credits.push_back("_Neil Mitchell");
   credits.push_back("_Jason Green");
   credits.push_back("n");
@@ -108,7 +108,7 @@
   credits.push_back(_("-Gfx"));
   credits.push_back("_Alan Tennent");
   credits.push_back("_Craig Timpany");
-  credits.push_back("_Erik S�e S�rensen");
+  credits.push_back("_Erik Søe Sørensen");
   credits.push_back("_Ingo Ruhnke");
   credits.push_back("_Jarno Elonen");
   credits.push_back("_Joel Fauche");
@@ -140,7 +140,7 @@
   credits.push_back("_David Philippi");
   credits.push_back("_Giray Devlet");
   credits.push_back("_Ingo Ruhnke");
-  credits.push_back("_Janne Mor�n");
+  credits.push_back("_Janne Morén");
   credits.push_back("_Jarno Elonen");
   credits.push_back("_Karl Ove Hufthammer");
   credits.push_back("_Milan Babuskov");
@@ -269,19 +269,13 @@
   gc.draw(blackboard, Vector2i(gc.get_width()/2, gc.get_height()/2));
 
   gc.draw(pingu, Vector2i(gc.get_width()/2, gc.get_height()/2 - 20));
-  
-  gc.print_right(Fonts::chalk_normal,
-                 Vector2i(Display::get_width()/2 + 275,
-                          Display::get_height()/2 + 110),
-                _("Exit"));
-  
+    
   yof = 0;
 
   scene_context->clear();
-  scene_context->set_cliprect(Rect(0,
-                                   static_cast<int>(0.125f * gc.get_height()),
-                                   static_cast<int>(gc.get_width()),
-                                   static_cast<int>(0.833f * 
gc.get_height())));
+  scene_context->set_cliprect(Rect(gc.get_width()/2 - 685/2, gc.get_height()/2 
- 250,
+                                   gc.get_width()/2 + 685/2, gc.get_height()/2 
+ 250));
+
   for (std::vector<std::string>::iterator i = credits.begin(); i != 
credits.end(); ++i)
     {
       switch ((*i)[0])
@@ -328,5 +322,5 @@
 {
   ScreenManager::instance ()->pop_screen ();
 }
-
+
 /* EOF */