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

[jsalmon3]

Author: jsalmon3
Date: 2007-08-16 05:46:42 +0200 (Thu, 16 Aug 2007)
New Revision: 2951

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/worldmap/worldmap.cpp
Log:
Fixed worldmap scrolling

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-16 03:24:37 UTC (rev 2950)
+++ branches/pingus_sdl/TODO    2007-08-16 03:46:42 UTC (rev 2951)
@@ -72,8 +72,6 @@
 
 - story graphics have a missing vertical line (due to age old gimp scaling bug)
 
-- worldmap scrolling seems to be broken when using small resolutions (-g 
400x300)
-
 - separate gfx/colmap surfaces aren't used
 
 - CollisionMask can't handle RGBA images and likely shouldn't (due to

Modified: branches/pingus_sdl/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cpp       2007-08-16 03:24:37 UTC 
(rev 2950)
+++ branches/pingus_sdl/src/worldmap/worldmap.cpp       2007-08-16 03:46:42 UTC 
(rev 2951)
@@ -175,7 +175,7 @@
       min = float(height - gc.get_height()/2);
       max = float(gc.get_height()/2);
     }
-  pingu_pos.y = Math::clamp(min, pingu_pos.x, max);
+  pingu_pos.y = Math::clamp(min, pingu_pos.y, max);
 
   gc_state.set_pos(Vector2f(pingu_pos.x, pingu_pos.y));