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

[jsalmon3]

Author: jsalmon3
Date: 2007-08-22 07:49:34 +0200 (Wed, 22 Aug 2007)
New Revision: 3010

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/credits.cpp
   branches/pingus_sdl/src/worldmap/worldmap.cpp
Log:
Fixed level name placement on worldmap in higher resolutions, fixed credits 
clip rect at higher resolutions

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-21 18:50:53 UTC (rev 3009)
+++ branches/pingus_sdl/TODO    2007-08-22 05:49:34 UTC (rev 3010)
@@ -71,10 +71,6 @@
 
 - disable demo-writing per default
 
-- level name placement on worldmap is completly wrong in higher resolutions
-
-- credits are cut of at higher resolutions
-
 - bridging gets more complicated has graphical error (background?!)
 
 - there seems to be a bug in the sprite class causing a double-free,

Modified: branches/pingus_sdl/src/credits.cpp
===================================================================
--- branches/pingus_sdl/src/credits.cpp 2007-08-21 18:50:53 UTC (rev 3009)
+++ branches/pingus_sdl/src/credits.cpp 2007-08-22 05:49:34 UTC (rev 3010)
@@ -278,8 +278,9 @@
 
   scene_context->clear();
   scene_context->set_cliprect(Rect(0,
-                                   static_cast<int>(gc.get_height()/2-225), 
600,
-                                   static_cast<int>(gc.get_height()/2+200)));
+                                   static_cast<int>(0.125f * gc.get_height()),
+                                   static_cast<int>(gc.get_width()),
+                                   static_cast<int>(0.833f * 
gc.get_height())));
   for (std::vector<std::string>::iterator i = credits.begin(); i != 
credits.end(); ++i)
     {
       switch ((*i)[0])

Modified: branches/pingus_sdl/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cpp       2007-08-21 18:50:53 UTC 
(rev 3009)
+++ branches/pingus_sdl/src/worldmap/worldmap.cpp       2007-08-22 05:49:34 UTC 
(rev 3010)
@@ -185,7 +185,7 @@
   for (DrawableLst::iterator i = drawables.begin (); i != drawables.end (); 
++i)
     (*i)->draw(gc);
 
-  Vector3f mpos = gc.screen_to_world(Vector3f((float)mouse_x, (float)mouse_y));
+  Vector2f mpos = gc_state.screen2world(Vector2i(mouse_x, mouse_y));
   Dot* dot = path_graph->get_dot(mpos.x, mpos.y);
   if (dot)
     dot->draw_hover(gc);