[Pingus-CVS] r2450 - trunk/src/worldobjs

[David Philippi at BerliOS]

Author: torangan
Date: 2005-09-29 15:51:25 +0200 (Thu, 29 Sep 2005)
New Revision: 2450

Modified:
   trunk/src/worldobjs/exit.cxx
   trunk/src/worldobjs/surface_background.cxx
Log:
applied patches from Tom?\195?\161?\197?\161 Bl?\195?\161ha

Modified: trunk/src/worldobjs/exit.cxx
===================================================================
--- trunk/src/worldobjs/exit.cxx        2005-09-29 11:02:44 UTC (rev 2449)
+++ trunk/src/worldobjs/exit.cxx        2005-09-29 13:51:25 UTC (rev 2450)
@@ -93,7 +93,7 @@
   for (PinguIter pingu = holder->begin(); pingu != holder->end(); ++pingu)
     {
       if (   (*pingu)->get_x() > pos.x - 1 && (*pingu)->get_x() < pos.x + 1
-         && (*pingu)->get_y() > pos.y - 5 && (*pingu)->get_y() < pos.y + 1)
+         && (*pingu)->get_y() > pos.y - 5 && (*pingu)->get_y() < pos.y + 2)
        {
          if (   (*pingu)->get_status() != PS_EXITED
              && (*pingu)->get_status() != PS_DEAD

Modified: trunk/src/worldobjs/surface_background.cxx
===================================================================
--- trunk/src/worldobjs/surface_background.cxx  2005-09-29 11:02:44 UTC (rev 
2449)
+++ trunk/src/worldobjs/surface_background.cxx  2005-09-29 13:51:25 UTC (rev 
2450)
@@ -195,12 +195,12 @@
           start_x = static_cast<int>((x_of * para_x) + scroll_ox);
           start_y = static_cast<int>((y_of * para_y) + scroll_oy);
 
-          if (start_x >= 0)
+          while (start_x >= 0)
             start_x = start_x - bg_surface.get_width();
 
-          if (start_y >= 0)
+          while (start_y >= 0)
             start_y -= bg_surface.get_height();
-          else if (start_y < 0 - static_cast<int>(bg_surface.get_height()))
+          while (start_y < 0 - static_cast<int>(bg_surface.get_height()))
             start_y += bg_surface.get_height();
 
           for(int y = start_y;