X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=499469d696a4972e429ac92e9185ab8161725c36;hb=d4eb344ff45f9e02bf2de2192bc752f5d09be287;hp=7ffa3c19226725869b5eebfe3883402bd4bd220d;hpb=b7d31643c9c84104fb3ebef778e545928610ff65;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 7ffa3c19..499469d6 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -27,41 +27,111 @@
 
 #include <math.h>
 
+#ifdef MSDOS
+extern BOOL wait_for_vsync;
+#endif
+
+void SetDrawtoField(int mode)
+{
+  if (mode == DRAW_BUFFERED && soft_scrolling_on)
+  {
+    FX = TILEX;
+    FY = TILEY;
+    BX1 = -1;
+    BY1 = -1;
+    BX2 = SCR_FIELDX;
+    BY2 = SCR_FIELDY;
+    redraw_x1 = 1;
+    redraw_y1 = 1;
+
+    drawto_field = fieldbuffer;
+  }
+  else	/* DRAW_DIRECT, DRAW_BACKBUFFER */
+  {
+    FX = SX;
+    FY = SY;
+    BX1 = 0;
+    BY1 = 0;
+    BX2 = SCR_FIELDX - 1;
+    BY2 = SCR_FIELDY - 1;
+    redraw_x1 = 0;
+    redraw_y1 = 0;
+
+    drawto_field = (mode == DRAW_DIRECT ? window :  backbuffer);
+  }
+}
+
 void BackToFront()
 {
   int x,y;
+  Drawable buffer = (drawto_field != window ? drawto_field : backbuffer);
 
-  if (direct_draw_on && game_status==PLAYING)
+  if (direct_draw_on && game_status == PLAYING)
     redraw_mask &= ~REDRAW_MAIN;
 
+  if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
+    redraw_mask |= REDRAW_FIELD;
+
+  if (redraw_mask & REDRAW_FIELD || ScreenMovPos)
+    redraw_mask &= ~REDRAW_TILES;
+
   if (!redraw_mask)
     return;
 
-  if (redraw_mask & REDRAW_ALL ||
-      (redraw_mask & REDRAW_FIELD && redraw_mask & REDRAW_DOORS))
+  /* synchronize X11 graphics at this point; if we would synchronize the
+     display immediately after the buffer switching (after the XFlush),
+     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);
+
+#ifdef MSDOS
+  wait_for_vsync = TRUE;
+#endif
+
+  if (redraw_mask & REDRAW_ALL)
   {
     XCopyArea(display,backbuffer,window,gc,
 	      0,0, WIN_XSIZE,WIN_YSIZE,
 	      0,0);
     redraw_mask = 0;
   }
-  else if (redraw_mask & REDRAW_FIELD)
+
+  if (redraw_mask & REDRAW_FIELD)
   {
-    XCopyArea(display,backbuffer,window,gc,
-	      REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
-	      REAL_SX,REAL_SY);
+    if (game_status != PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER)
+      XCopyArea(display,backbuffer,window,gc,
+		REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
+		REAL_SX,REAL_SY);
+    else
+    {
+      int fx = FX, fy = FY;
+
+      if (soft_scrolling_on)
+      {
+	fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
+	fy += (PlayerMovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
+      }
+
+      XCopyArea(display,buffer,window,gc,
+		fx,fy, SXSIZE,SYSIZE,
+		SX,SY);
+    }
     redraw_mask &= ~REDRAW_MAIN;
   }
-  else if (redraw_mask & REDRAW_DOORS)
+
+  if (redraw_mask & REDRAW_DOORS)
   {
     if (redraw_mask & REDRAW_DOOR_1)
       XCopyArea(display,backbuffer,window,gc,
-		DX,DY, DXSIZE,DYSIZE, DX,DY);
+		DX,DY, DXSIZE,DYSIZE,
+		DX,DY);
     if (redraw_mask & REDRAW_DOOR_2)
     {
       if ((redraw_mask & REDRAW_DOOR_2) == REDRAW_DOOR_2)
 	XCopyArea(display,backbuffer,window,gc,
-		  VX,VY, VXSIZE,VYSIZE, VX,VY);
+		  VX,VY, VXSIZE,VYSIZE,
+		  VX,VY);
       else
       {
 	if (redraw_mask & REDRAW_VIDEO_1)
@@ -97,28 +167,25 @@ void BackToFront()
 
   if (redraw_mask & REDRAW_TILES)
   {
-    if (redraw_tiles>REDRAWTILES_TH)
-      XCopyArea(display,backbuffer,window,gc,SX,SY,SXSIZE,SYSIZE,SX,SY);
-    else
-      for(x=0;x<SCR_FIELDX;x++)
-	for(y=0;y<SCR_FIELDY;y++)
-	  if (redraw[x][y])
-	    XCopyArea(display,backbuffer,window,gc,
-		      SX+x*TILEX,SY+y*TILEY,TILEX,TILEY,SX+x*TILEX,SY+y*TILEY);
+    for(x=0; x<SCR_FIELDX; x++)
+      for(y=0; y<SCR_FIELDY; y++)
+	if (redraw[redraw_x1 + x][redraw_y1 + y])
+	  XCopyArea(display,buffer,window,gc,
+		    FX+x*TILEX,FX+y*TILEY, TILEX,TILEY,
+		    SX+x*TILEX,SY+y*TILEY);
   }
 
   XFlush(display);
 
-  for(x=0;x<SCR_FIELDX;x++)
-    for(y=0;y<SCR_FIELDY;y++)
-      redraw[x][y]=0;
-  redraw_tiles=0;
-  redraw_mask=0;
+  for(x=0; x<MAX_BUF_XSIZE; x++)
+    for(y=0; y<MAX_BUF_YSIZE; y++)
+      redraw[x][y] = 0;
+  redraw_tiles = 0;
+  redraw_mask = 0;
 }
 
 void FadeToFront()
 {
-
 /*
   long fading_delay = 300000;
 
@@ -187,26 +254,35 @@ void FadeToFront()
 
 void ClearWindow()
 {
-  drawto_field = backbuffer;
-  XFillRectangle(display,drawto_field,gc,
-		 REAL_SX,REAL_SY,FULL_SXSIZE,FULL_SYSIZE);
-  redraw_mask|=REDRAW_FIELD;
+  XFillRectangle(display,backbuffer,gc,
+		 REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
+
+  if (soft_scrolling_on && game_status==PLAYING)
+  {
+    XFillRectangle(display,fieldbuffer,gc,
+		   0,0, FXSIZE,FYSIZE);
+    SetDrawtoField(DRAW_BUFFERED);
+  }
+  else
+    SetDrawtoField(DRAW_BACKBUFFER);
 
   if (direct_draw_on && game_status==PLAYING)
   {
-    drawto_field = window;
-    XFillRectangle(display,drawto_field,gc,
-		   REAL_SX,REAL_SY,FULL_SXSIZE,FULL_SYSIZE);
+    XFillRectangle(display,window,gc,
+		   REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
+    SetDrawtoField(DRAW_DIRECT);
   }
+
+  redraw_mask |= REDRAW_FIELD;
 }
 
 void DrawText(int x, int y, char *text, int font, int col)
 {
   DrawTextExt(drawto, gc, x, y, text, font, col);
-  if (x<DX)
-    redraw_mask|=REDRAW_FIELD;
-  else if (y<VY)
-    redraw_mask|=REDRAW_DOOR_1;
+  if (x < DX)
+    redraw_mask |= REDRAW_FIELD;
+  else if (y < VY)
+    redraw_mask |= REDRAW_DOOR_1;
 }
 
 void DrawTextExt(Drawable d, GC gc, int x, int y,
@@ -258,6 +334,9 @@ void DrawPlayerField()
 {
   int x = JX, y = JY;
   int sx = SCROLLX(x), sy = SCROLLY(y);
+
+  int sxx = 0, syy = 0;
+
   int element = Feld[x][y];
   int graphic, phase;
   BOOL draw_thru_mask = FALSE;
@@ -269,6 +348,7 @@ void DrawPlayerField()
   if (!IN_LEV_FIELD(x,y) || !IN_SCR_FIELD(sx,sy))
   {
     printf("DrawPlayerField(): x = %d, y = %d\n",x,y);
+    printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy);
     printf("DrawPlayerField(): This should never happen!\n");
     return;
   }
@@ -278,20 +358,41 @@ void DrawPlayerField()
     return;
 
   if (direct_draw_on)
-    drawto_field = backbuffer;
+    SetDrawtoField(DRAW_BUFFERED);
 
   /* draw things behind the player (EL_PFORTE* || mole/penguin/pig/dragon) */
 
+
+
+
+  DrawLevelField(x,y);
+
+
+
   if (Store[x][y])
   {
     DrawGraphic(sx,sy, el2gfx(Store[x][y]));
     draw_thru_mask = TRUE;
   }
+  else if (element!=EL_DYNAMIT && element!=EL_DYNABOMB)
+  {
+    DrawLevelField(x,y);
+    draw_thru_mask = TRUE;
+  }
+
+  /*
   else if (element!=EL_LEERRAUM && element!=EL_DYNAMIT && element!=EL_DYNABOMB)
   {
     DrawLevelField(x,y);
     draw_thru_mask = TRUE;
   }
+  */
+
+
+  draw_thru_mask = TRUE;
+
+
+
 
   /* draw player himself */
 
@@ -306,10 +407,79 @@ void DrawPlayerField()
 
   graphic += PlayerFrame;
 
+
+  if (PlayerGfxPos)
+  {
+    if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT)
+      sxx = PlayerGfxPos;
+    else
+      syy = PlayerGfxPos;
+  }
+
+
+  if (!soft_scrolling_on && ScreenMovPos)
+    sxx = syy = 0;
+
+
+
+
+
+
   if (draw_thru_mask)
-    DrawGraphicThruMask(sx,sy, graphic);
+    DrawGraphicShiftedThruMask(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING);
+    /*
+    DrawGraphicThruMask(sx, sy, graphic);
+    */
   else
-    DrawGraphic(sx,sy, graphic);
+    DrawGraphicShifted(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING);
+  /*
+    DrawGraphic(sx, sy, graphic);
+    */
+
+
+
+  MarkTileDirty(sx,sy);
+
+
+
+  if (PlayerPushing && PlayerGfxPos)
+  {
+    int nextJX = JX + (JX - lastJX);
+    int nextJY = JY + (JY - lastJY);
+    int px = SCROLLX(nextJX), py = SCROLLY(nextJY);
+
+    if (Feld[JX][JY] == EL_SOKOBAN_FELD_LEER ||
+	Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+      DrawGraphicShiftedThruMask(px,py,sxx,syy,
+				 GFX_SOKOBAN_OBJEKT,
+				 CUT_NO_CUTTING);
+    else
+    {
+      int element = Feld[nextJX][nextJY];
+      int graphic = el2gfx(element);
+
+      if (element == EL_FELSBROCKEN && sxx)
+      {
+	int phase = (PlayerGfxPos / (TILEX/4));
+
+	if (PlayerMovDir == MV_LEFT)
+	  graphic += phase;
+	else
+	  graphic += (phase+4)%4;
+
+
+	/*
+	printf("----> (%d, %d, %d)\n",
+	       PlayerGfxPos, phase, graphic);
+	       */
+
+      }
+
+      DrawGraphicShifted(px,py, sxx,syy, graphic, CUT_NO_CUTTING);
+    }
+  }
+
+
 
   /* draw things in front of player (EL_DYNAMIT || EL_DYNABOMB) */
 
@@ -319,12 +489,12 @@ void DrawPlayerField()
 
     if (element == EL_DYNAMIT)
     {
-      if ((phase = (48-MovDelay[x][y])/6) > 6)
+      if ((phase = (96-MovDelay[x][y])/12) > 6)
 	phase = 6;
     }
     else
     {
-      if ((phase = ((48-MovDelay[x][y])/3) % 8) > 3)
+      if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3)
 	phase = 7-phase;
     }
 
@@ -335,10 +505,20 @@ void DrawPlayerField()
   {
     int dest_x = SX+SCROLLX(x)*TILEX;
     int dest_y = SY+SCROLLY(y)*TILEY;
+    int x_size = TILEX;
+    int y_size = TILEY;
 
-    XCopyArea(display,backbuffer,window,gc,
-	      dest_x,dest_y, TILEX,TILEY, dest_x,dest_y);
-    drawto_field = window;
+    if (!ScreenMovPos)
+    {
+      dest_x = SX + SCROLLX(MIN(JX,lastJX))*TILEX;
+      dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY;
+      x_size = TILEX * (1 + ABS(JX - lastJX));
+      y_size = TILEY * (1 + ABS(JY - lastJY));
+    }
+
+    XCopyArea(display,drawto_field,window,gc,
+	      dest_x,dest_y, x_size,y_size, dest_x,dest_y);
+    SetDrawtoField(DRAW_DIRECT);
   }
 }
 
@@ -355,6 +535,9 @@ static int getGraphicAnimationPhase(int frames, int delay, int mode)
   else
     phase = (FrameCounter % (delay * frames)) / delay;
 
+  if (mode == ANIM_REVERSE)
+    phase = -phase;
+
   return(phase);
 }
 
@@ -363,19 +546,6 @@ void DrawGraphicAnimation(int x, int y, int graphic,
 {
   int phase = getGraphicAnimationPhase(frames, delay, mode);
 
-/*
-  int phase;
-
-  if (mode == ANIM_OSCILLATE)
-  {
-    int max_anim_frames = frames*2 - 2;
-    phase = (FrameCounter % (delay * max_anim_frames)) / delay;
-    phase = (phase < frames ? phase : max_anim_frames - phase);
-  }
-  else
-    phase = (FrameCounter % (delay * frames)) / delay;
-*/
-
   if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
     DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase);
 }
@@ -393,14 +563,12 @@ void DrawGraphic(int x, int y, int graphic)
 #endif
 
   DrawGraphicExt(drawto_field, gc, x, y, graphic);
-  redraw_tiles++;
-  redraw[x][y] = TRUE;
-  redraw_mask |= REDRAW_TILES;
+  MarkTileDirty(x,y);
 }
 
 void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
 {
-  DrawGraphicExtHiRes(d, gc, SX+x*TILEX, SY+y*TILEY, graphic);
+  DrawGraphicExtHiRes(d, gc, FX+x*TILEX, FY+y*TILEY, graphic);
 }
 
 void DrawGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic)
@@ -452,8 +620,8 @@ void DrawGraphicThruMask(int x, int y, int graphic)
     graphic -= GFX_START_ROCKSSCREEN;
     src_x  = SX+(graphic % GFX_PER_LINE)*TILEX;
     src_y  = SY+(graphic / GFX_PER_LINE)*TILEY;
-    dest_x = SX+x*TILEX;
-    dest_y = SY+y*TILEY;
+    dest_x = FX+x*TILEX;
+    dest_y = FY+y*TILEY;
 
     XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
     XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
@@ -464,8 +632,8 @@ void DrawGraphicThruMask(int x, int y, int graphic)
     graphic -= GFX_START_ROCKSHEROES;
     src_x  = (graphic % HEROES_PER_LINE)*TILEX;
     src_y  = (graphic / HEROES_PER_LINE)*TILEY;
-    dest_x = SX+x*TILEX;
-    dest_y = SY+y*TILEY;
+    dest_x = FX+x*TILEX;
+    dest_y = FY+y*TILEY;
 
     XSetClipOrigin(display,clip_gc[PIX_HEROES],dest_x-src_x,dest_y-src_y);
     XCopyArea(display,pix[PIX_HEROES],drawto_field,clip_gc[PIX_HEROES],
@@ -477,9 +645,7 @@ void DrawGraphicThruMask(int x, int y, int graphic)
     return;
   }
 
-  redraw_tiles++;
-  redraw[x][y]=TRUE;
-  redraw_mask|=REDRAW_TILES;
+  MarkTileDirty(x,y);
 }
 
 void DrawElementThruMask(int x, int y, int element)
@@ -490,9 +656,7 @@ void DrawElementThruMask(int x, int y, int element)
 void DrawMiniGraphic(int x, int y, int graphic)
 {
   DrawMiniGraphicExt(drawto, gc, x, y, graphic);
-  redraw_tiles++;
-  redraw[x/2][y/2]=TRUE;
-  redraw_mask|=REDRAW_TILES;
+  MarkTileDirty(x/2, y/2);
 }
 
 void DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
@@ -528,7 +692,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
   int width = TILEX, height = TILEY;
   int cx = 0, cy = 0;
 
-  if (graphic<0)
+  if (graphic < 0)
   {
     DrawGraphic(x,y,graphic);
     return;
@@ -536,66 +700,66 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
 
   if (dx || dy)			/* Verschiebung der Grafik? */
   {
-    if (x<0)			/* Element kommt von links ins Bild */
+    if (x < BX1)		/* Element kommt von links ins Bild */
     {
-      x=0;
-      width=dx;
-      cx=TILEX-dx;
-      dx=0;
+      x = BX1;
+      width = dx;
+      cx = TILEX - dx;
+      dx = 0;
     }
-    else if (x==SCR_FIELDX)	/* Element kommt von rechts ins Bild */
+    else if (x > BX2)		/* Element kommt von rechts ins Bild */
     {
-      x=SCR_FIELDX-1;
-      width=-dx;
-      dx=TILEX+dx;
+      x = BX2;
+      width = -dx;
+      dx = TILEX + dx;
     }
-    else if (x==0 && dx<0)	/* Element verläßt links das Bild */
+    else if (x==BX1 && dx<0)	/* Element verläßt links das Bild */
     {
-      width+=dx;
-      cx=-dx;
-      dx=0;
+      width += dx;
+      cx = -dx;
+      dx = 0;
     }
-    else if (x==SCR_FIELDX-1 && dx>0)	/* El. verläßt rechts das Bild */
-      width-=dx;
+    else if (x==BX2 && dx>0)	/* Element verläßt rechts das Bild */
+      width -= dx;
     else if (dx)		/* allg. Bewegung in x-Richtung */
-      redraw[x+SIGN(dx)][y]=TRUE;
+      MarkTileDirty(x + SIGN(dx), y);
 
-    if (y<0)			/* Element kommt von oben ins Bild */
+    if (y < BY1)		/* Element kommt von oben ins Bild */
     {
       if (cut_mode==CUT_BELOW)	/* Element oberhalb des Bildes */
 	return;
 
-      y=0;
-      height=dy;
-      cy=TILEY-dy;
-      dy=0;
+      y = BY1;
+      height = dy;
+      cy = TILEY - dy;
+      dy = 0;
     }
-    else if (y==SCR_FIELDY)	/* Element kommt von unten ins Bild */
+    else if (y > BY2)		/* Element kommt von unten ins Bild */
     {
-      y=SCR_FIELDY-1;
-      height=-dy;
-      dy=TILEY+dy;
+      y = BY2;
+      height = -dy;
+      dy = TILEY + dy;
     }
-    else if (y==0 && dy<0)	/* Element verläßt oben das Bild */
+    else if (y==BY1 && dy<0)	/* Element verläßt oben das Bild */
     {
-      height+=dy;
-      cy=-dy;
-      dy=0;
+      height += dy;
+      cy = -dy;
+      dy = 0;
     }
-    else if (dy>0 && cut_mode==CUT_ABOVE)
+    else if (dy > 0 && cut_mode==CUT_ABOVE)
     {
-      if (y==SCR_FIELDY-1)	/* Element unterhalb des Bildes */
+      if (y == BY2)		/* Element unterhalb des Bildes */
 	return;
 
-      height=dy;
-      cy=TILEY-dy;
-      dy=TILEY;
-      redraw[x][y+1]=TRUE;
+      height = dy;
+      cy = TILEY-dy;
+      dy = TILEY;
+      MarkTileDirty(x, y + 1);
     }				/* Element verläßt unten das Bild */
-    else if (dy>0 && (y==SCR_FIELDY-1 || cut_mode==CUT_BELOW))
-      height-=dy;
+    else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW))
+      height -= dy;
     else if (dy)		/* allg. Bewegung in y-Richtung */
-      redraw[x][y+SIGN(dy)]=TRUE;
+      MarkTileDirty(x, y + SIGN(dy));
   }
 
   if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
@@ -604,7 +768,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
     XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
 	      SX+(graphic % GFX_PER_LINE)*TILEX+cx,
 	      SY+(graphic / GFX_PER_LINE)*TILEY+cy,
-	      width,height, SX+x*TILEX+dx,SY+y*TILEY+dy);
+	      width,height, FX+x*TILEX+dx,FY+y*TILEY+dy);
   }
   else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
   {
@@ -612,7 +776,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
     XCopyArea(display,pix[PIX_HEROES],drawto_field,gc,
 	      (graphic % HEROES_PER_LINE)*TILEX+cx,
 	      (graphic / HEROES_PER_LINE)*TILEY+cy,
-	      width,height, SX+x*TILEX+dx,SY+y*TILEY+dy);
+	      width,height, FX+x*TILEX+dx,FY+y*TILEY+dy);
   }
 
 #if DEBUG
@@ -624,9 +788,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
   }
 #endif
 
-  redraw_tiles++;
-  redraw[x][y]=TRUE;
-  redraw_mask|=REDRAW_TILES;
+  MarkTileDirty(x,y);
 }
 
 void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode)
@@ -641,11 +803,11 @@ void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode)
   {
     graphic += 4*!phase;
 
-    if (dir==MV_UP)
+    if (dir == MV_UP)
       graphic += 1;
-    else if (dir==MV_LEFT)
+    else if (dir == MV_LEFT)
       graphic += 2;
-    else if (dir==MV_DOWN)
+    else if (dir == MV_DOWN)
       graphic += 3;
   }
   else if (element==EL_MAULWURF || element==EL_PINGUIN ||
@@ -715,6 +877,121 @@ void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode)
     DrawGraphic(x,y, graphic);
 }
 
+void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
+				int cut_mode)
+{
+  int width = TILEX, height = TILEY;
+  int cx = 0, cy = 0;
+  int src_x,src_y, dest_x,dest_y;
+
+  if (graphic < 0)
+  {
+    DrawGraphic(x,y,graphic);
+    return;
+  }
+
+  if (dx || dy)			/* Verschiebung der Grafik? */
+  {
+    if (x < BX1)		/* Element kommt von links ins Bild */
+    {
+      x = BX1;
+      width = dx;
+      cx = TILEX - dx;
+      dx = 0;
+    }
+    else if (x > BX2)		/* Element kommt von rechts ins Bild */
+    {
+      x = BX2;
+      width = -dx;
+      dx = TILEX + dx;
+    }
+    else if (x==BX1 && dx<0)	/* Element verläßt links das Bild */
+    {
+      width += dx;
+      cx = -dx;
+      dx = 0;
+    }
+    else if (x==BX2 && dx>0)	/* Element verläßt rechts das Bild */
+      width -= dx;
+    else if (dx)		/* allg. Bewegung in x-Richtung */
+      MarkTileDirty(x + SIGN(dx), y);
+
+    if (y < BY1)		/* Element kommt von oben ins Bild */
+    {
+      if (cut_mode==CUT_BELOW)	/* Element oberhalb des Bildes */
+	return;
+
+      y = BY1;
+      height = dy;
+      cy = TILEY - dy;
+      dy = 0;
+    }
+    else if (y > BY2)		/* Element kommt von unten ins Bild */
+    {
+      y = BY2;
+      height = -dy;
+      dy = TILEY + dy;
+    }
+    else if (y==BY1 && dy<0)	/* Element verläßt oben das Bild */
+    {
+      height += dy;
+      cy = -dy;
+      dy = 0;
+    }
+    else if (dy > 0 && cut_mode==CUT_ABOVE)
+    {
+      if (y == BY2)		/* Element unterhalb des Bildes */
+	return;
+
+      height = dy;
+      cy = TILEY-dy;
+      dy = TILEY;
+      MarkTileDirty(x, y + 1);
+    }				/* Element verläßt unten das Bild */
+    else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW))
+      height -= dy;
+    else if (dy)		/* allg. Bewegung in y-Richtung */
+      MarkTileDirty(x, y + SIGN(dy));
+  }
+
+  if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
+  {
+    graphic -= GFX_START_ROCKSSCREEN;
+    src_x  = SX+(graphic % GFX_PER_LINE)*TILEX+cx;
+    src_y  = SY+(graphic / GFX_PER_LINE)*TILEY+cy;
+    dest_x = FX+x*TILEX+dx;
+    dest_y = FY+y*TILEY+dy;
+
+    XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
+    XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
+              src_x,src_y, width,height, dest_x,dest_y);
+  }
+  else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
+  {
+    graphic -= GFX_START_ROCKSHEROES;
+    src_x  = (graphic % HEROES_PER_LINE)*TILEX+cx;
+    src_y  = (graphic / HEROES_PER_LINE)*TILEY+cy;
+    dest_x = FX+x*TILEX+dx;
+    dest_y = FY+y*TILEY+dy;
+
+    XSetClipOrigin(display,clip_gc[PIX_HEROES],dest_x-src_x,dest_y-src_y);
+    XCopyArea(display,pix[PIX_HEROES],drawto_field,clip_gc[PIX_HEROES],
+              src_x,src_y, width,height, dest_x,dest_y);
+  }
+
+#if DEBUG
+  if (!IN_SCR_FIELD(x,y))
+  {
+    printf("DrawGraphicShiftedThruMask(): x = %d, y = %d, graphic = %d\n",
+	   x,y,graphic);
+    printf("DrawGraphicShifted(): This should never happen!\n");
+    return;
+  }
+#endif
+
+  MarkTileDirty(x,y);
+}
+
 void ErdreichAnbroeckeln(int x, int y)
 {
   int i, width, height, cx,cy;
@@ -777,11 +1054,10 @@ void ErdreichAnbroeckeln(int x, int y)
       XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
 		SX+(graphic % GFX_PER_LINE)*TILEX+cx,
 		SY+(graphic / GFX_PER_LINE)*TILEY+cy,
-		width,height, SX+x*TILEX+cx,SY+y*TILEY+cy);
+		width,height, FX+x*TILEX+cx,FY+y*TILEY+cy);
     }
 
-    redraw_tiles++;
-    redraw[x][y]=TRUE;
+    MarkTileDirty(x,y);
   }
   else
   {
@@ -823,10 +1099,9 @@ void ErdreichAnbroeckeln(int x, int y)
       XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
 		SX+(graphic % GFX_PER_LINE)*TILEX+cx,
 		SY+(graphic / GFX_PER_LINE)*TILEY+cy,
-		width,height, SX+xx*TILEX+cx,SY+yy*TILEY+cy);
+		width,height, FX+xx*TILEX+cx,FY+yy*TILEY+cy);
 
-      redraw_tiles++;
-      redraw[xx][yy]=TRUE;
+      MarkTileDirty(xx,yy);
     }
   }
 }
@@ -948,10 +1223,6 @@ void DrawMiniElement(int x, int y, int element)
 
   graphic = el2gfx(element);
   DrawMiniGraphic(x,y,graphic);
-
-  redraw_tiles++;
-  redraw[x/2][y/2]=TRUE;
-  redraw_mask|=REDRAW_TILES;
 }
 
 void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y)
@@ -987,11 +1258,16 @@ void DrawLevel()
 
   ClearWindow();
 
-  for(x=0;x<SCR_FIELDX;x++)
-    for(y=0;y<SCR_FIELDY;y++)
+  for(x=BX1; x<=BX2; x++)
+    for(y=BY1; y<=BY2; y++)
       DrawScreenField(x,y);
 
-  redraw_mask |= REDRAW_FIELD;
+  if (soft_scrolling_on)
+    XCopyArea(display,fieldbuffer,backbuffer,gc,
+	      FX,FY, SXSIZE,SYSIZE,
+	      SX,SY);
+
+  redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
 }
 
 void DrawMiniLevel(int scroll_x, int scroll_y)
@@ -1195,10 +1471,16 @@ BOOL AreYouSure(char *text, unsigned int ays_state)
 	      break;
 	  }
 	  break;
+	case KeyRelease:
+	  key_joystick_mapping = 0;
+	  break;
 	case FocusIn:
 	case FocusOut:
 	  HandleFocusEvent((XFocusChangeEvent *) &event);
 	  break;
+        case ClientMessage:
+	  HandleClientMessageEvent((XClientMessageEvent *) &event);
+	  break;
 	default:
 	  break;
       }
@@ -1247,10 +1529,6 @@ unsigned int OpenDoor(unsigned int door_state)
 
   new_door_state = MoveDoor(door_state);
 
-/*
-  ClearEventQueue();
-*/
-
   return(new_door_state);
 }
 
@@ -1265,10 +1543,6 @@ unsigned int CloseDoor(unsigned int door_state)
 
   new_door_state = MoveDoor(door_state);
 
-/*
-  ClearEventQueue();
-*/
-
   return(new_door_state);
 }
 
@@ -1281,7 +1555,9 @@ unsigned int MoveDoor(unsigned int door_state)
 {
   static unsigned int door1 = DOOR_OPEN_1;
   static unsigned int door2 = DOOR_CLOSE_2;
-  int x, start, stepsize = 4, door_anim_delay = stepsize*5000;
+  static long door_delay = 0;
+  int x, start, stepsize = 2;
+  long door_delay_value = stepsize * 5000;
 
   if (door_state == DOOR_GET_STATE)
     return(door1 | door2);
@@ -1298,7 +1574,7 @@ unsigned int MoveDoor(unsigned int door_state)
   if (quick_doors)
   {
     stepsize = 20;
-    door_anim_delay = 0;
+    door_delay_value = 0;
     StopSound(SND_OEFFNEN);
   }
 
@@ -1309,8 +1585,11 @@ unsigned int MoveDoor(unsigned int door_state)
 
     start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0);
 
-    for(x=start;x<=DXSIZE;x+=stepsize)
+    for(x=start; x<=DXSIZE; x+=stepsize)
     {
+      while(!DelayReached(&door_delay, door_delay_value/10000))
+	Delay(1000);
+
       if (door_state & DOOR_ACTION_1)
       {
 	int i = (door_state & DOOR_OPEN_1 ? DXSIZE-x : x);
@@ -1386,7 +1665,6 @@ unsigned int MoveDoor(unsigned int door_state)
       }
 
       BackToFront();
-      Delay(door_anim_delay);
 
       if (game_status==MAINMENU)
 	DoAnimation();