X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=4bbe67f21b9bf21be5ecf2d1c2b7f93ec78183bb;hb=5ed4de42ced8e7dce5b786ba3d5fd1a6f6a7d7f6;hp=671e2d89348b41c53c17935a534c29b757104735;hpb=dbdefdcdfa0fa58296160ffc6b72fea58bea5c75;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 671e2d89..4bbe67f2 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -11,7 +11,6 @@
 *  tools.c                                                 *
 ***********************************************************/
 
-#include <math.h>
 #include <stdarg.h>
 
 #ifdef __FreeBSD__
@@ -90,11 +89,13 @@ void BackToFront()
      this could mean that we have to wait for the graphics to complete,
      although we could go on doing calculations for the next frame */
 
-  XSync(display,FALSE);
+  XSync(display, FALSE);
 
+  /*
 #ifdef MSDOS
   wait_for_vsync = TRUE;
 #endif
+  */
 
   if (redraw_mask & REDRAW_ALL)
   {
@@ -116,13 +117,15 @@ void BackToFront()
 
       if (setup.soft_scrolling)
       {
-	fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
-	fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
+	fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
+	fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
       }
 
-      XCopyArea(display,buffer,window,gc,
-		fx,fy, SXSIZE,SYSIZE,
-		SX,SY);
+      if (setup.soft_scrolling ||
+	  ABS(ScreenGfxPos) + ScrollStepSize == TILEX ||
+	  ABS(ScreenGfxPos) == ScrollStepSize ||
+	  redraw_tiles > REDRAWTILES_THRESHOLD)
+	XCopyArea(display, buffer, window, gc, fx, fy, SXSIZE, SYSIZE, SX, SY);
     }
     redraw_mask &= ~REDRAW_MAIN;
   }
@@ -158,6 +161,10 @@ void BackToFront()
 		    VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
       }
     }
+    if (redraw_mask & REDRAW_DOOR_3)
+      XCopyArea(display, backbuffer, window, gc,
+		EX, EY, EXSIZE, EYSIZE,
+		EX, EY);
     redraw_mask &= ~REDRAW_DOORS;
   }
 
@@ -828,6 +835,8 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
     src_x  = (graphic % HEROES_PER_LINE) * TILEX + cx;
     src_y  = (graphic / HEROES_PER_LINE) * TILEY + cy;
   }
+  else	/* big font graphics currently not allowed (and not needed) */
+    return;
 
   dest_x = FX + x * TILEX + dx;
   dest_y = FY + y * TILEY + dy;
@@ -1339,11 +1348,13 @@ boolean Request(char *text, unsigned int req_state)
   int mx, my, ty, result = -1;
   unsigned int old_door_state;
 
+#ifndef MSDOS
   /* pause network game while waiting for request to answer */
   if (options.network &&
       game_status == PLAYING &&
       req_state & REQUEST_WAIT_FOR)
     SendToServer_PausePlaying();
+#endif
 
   old_door_state = GetDoorState();
 
@@ -1545,11 +1556,13 @@ boolean Request(char *text, unsigned int req_state)
     }
   }
 
+#ifndef MSDOS
   /* continue network game after request */
   if (options.network &&
       game_status == PLAYING &&
       req_state & REQUEST_WAIT_FOR)
     SendToServer_ContinuePlaying();
+#endif
 
   return(result);
 }
@@ -1592,11 +1605,11 @@ unsigned int GetDoorState()
 
 unsigned int MoveDoor(unsigned int door_state)
 {
-  static unsigned int door1 = DOOR_OPEN_1;
-  static unsigned int door2 = DOOR_CLOSE_2;
-  static long door_delay = 0;
+  static int door1 = DOOR_OPEN_1;
+  static int door2 = DOOR_CLOSE_2;
+  static unsigned long door_delay = 0;
   int x, start, stepsize = 2;
-  long door_delay_value = stepsize * 5;
+  unsigned long door_delay_value = stepsize * 5;
 
   if (door_state == DOOR_GET_STATE)
     return(door1 | door2);