[Super-tux-commit] supertux/src world.cpp,1.87,1.88 defines.h,1.38,1.39

[Ryan F. <sik...@us...>]

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

Modified Files:
	world.cpp defines.h 
Log Message:
- some resolution fixes

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- defines.h	14 May 2004 16:02:40 -0000	1.38
+++ defines.h	14 May 2004 20:50:22 -0000	1.39
@@ -49,9 +49,10 @@
 };
 
 /* Screen-related stuff */
-
-#define VISIBLE_TILES_X 25
-#define VISIBLE_TILES_Y 19
+// +1 is needed because when tiles are wrapping around the screen there
+//  are two partial tiles on the screen
+#define VISIBLE_TILES_X 25 +1
+#define VISIBLE_TILES_Y 19 +1
 
 /* Sizes: */
 

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- world.cpp	14 May 2004 17:35:30 -0000	1.87
+++ world.cpp	14 May 2004 20:50:22 -0000	1.88
@@ -180,9 +180,14 @@
   /* Draw the real background */
   if(level->img_bkgd)
     {
-      int s = (int)((float)scroll_x * ((float)level->bkgd_speed/100.0f)) % screen->w;
-      level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h);
-      level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h);
+      // Tile background horizontally
+      int sx = (int)((float)scroll_x * ((float)level->bkgd_speed/100.0f)) % level->img_bkgd->w;
+      for (int i = 0; (i-1)*level->img_bkgd->w <= screen->w; i++)
+        {
+          level->img_bkgd->draw_part(i == 0 ? sx : 0, 0,
+                                     i == 0 ? 0 : (level->img_bkgd->w * i) - sx, 0,
+                                     i == 0 ? level->img_bkgd->w - sx : level->img_bkgd->w, level->img_bkgd->h);
+        }
     }
   else
     {
@@ -340,7 +345,7 @@
 
   if (scroll_y < 0)
   {
-    std::cerr << "Level too short!!" << std::endl;
+    //std::cerr << "Level too short!!" << std::endl;
     scroll_y = 0;
   }