[Super-tux-commit] supertux/src badguy.cpp,1.84,1.85 defines.h,1.40,1.41 special.cpp,1.48,1.49

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6029/src

Modified Files:
	badguy.cpp defines.h special.cpp 
Log Message:
Fixes.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- badguy.cpp	21 May 2004 00:22:57 -0000	1.84
+++ badguy.cpp	22 May 2004 17:55:39 -0000	1.85
@@ -755,9 +755,11 @@
 {
   float scroll_x = World::current()->displaymanager
     .get_viewport().get_translation().x;
+  float scroll_y = World::current()->displaymanager
+    .get_viewport().get_translation().y;
   
   // Remove if it's far off the screen:
-  if (base.x < scroll_x - OFFSCREEN_DISTANCE)
+  if (base.x < scroll_x - X_OFFSCREEN_DISTANCE)
     {
       remove_me();                                                
       return;
@@ -781,7 +783,10 @@
       }
 
   // Once it's on screen, it's activated!
-  if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE)
+  if (base.x > scroll_x - X_OFFSCREEN_DISTANCE &&
+       base.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE &&
+       base.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+       base.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
     seen = true;
 
   if(!seen)

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- defines.h	21 May 2004 23:37:56 -0000	1.40
+++ defines.h	22 May 2004 17:55:44 -0000	1.41
@@ -92,7 +92,8 @@
 
 /* Size constraints: */
 
-#define OFFSCREEN_DISTANCE 256
+#define X_OFFSCREEN_DISTANCE 280
+#define Y_OFFSCREEN_DISTANCE 240
 
 #define LEVEL_WIDTH 375
 

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- special.cpp	21 May 2004 00:22:57 -0000	1.48
+++ special.cpp	22 May 2004 17:55:44 -0000	1.49
@@ -190,15 +190,15 @@
     World::current()->displaymanager.get_viewport().get_translation().x;
   float scroll_y =                                                        
     World::current()->displaymanager.get_viewport().get_translation().y;
-  if(base.x < scroll_x - OFFSCREEN_DISTANCE
-      || base.y < scroll_y - OFFSCREEN_DISTANCE) {
-      remove_me();
-      return;
-  }
-  if(base.y > scroll_y + screen->h) {
+  
+  if(base.x < scroll_x - X_OFFSCREEN_DISTANCE ||
+      base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE ||
+      base.y < scroll_y - Y_OFFSCREEN_DISTANCE ||
+      base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
+    {
     remove_me();
     return;
-  }
+    }
 
   /* Move around? */
   physic.apply(elapsed_time, base.x, base.y);