X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f551a1fac7f0e3c1a9cd112ad31539a786304bba;hb=4b0c6356359ee52f98cee8fa578179c6c41d4ef1;hp=15c379531fc488fc94a14f84cc5b0c02b7d6cc5e;hpb=cf5b3a1e9077e88eb40ce2fb59e985a0ae037c84;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 15c37953..f551a1fa 100644
--- a/src/game.c
+++ b/src/game.c
@@ -23,10 +23,6 @@
 #include "tape.h"
 #include "joystick.h"
 
-extern int Gamespeed;
-extern int Movemethod;
-extern int Movespeed[2];
-
 void GetPlayerConfig()
 {
   int old_joystick_nr = joystick_nr;
@@ -49,13 +45,16 @@ void GetPlayerConfig()
   joystick_nr = SETUP_2ND_JOYSTICK_ON(player.setup);
   quick_doors = SETUP_QUICK_DOORS_ON(player.setup);
   scroll_delay_on = SETUP_SCROLL_DELAY_ON(player.setup);
+  soft_scrolling_on = SETUP_SOFT_SCROLL_ON(player.setup);
 
+#ifndef MSDOS
   if (joystick_nr != old_joystick_nr)
   {
     if (joystick_device)
       close(joystick_device);
     InitJoystick();
   }
+#endif
 }
 
 void InitGame()
@@ -74,7 +73,10 @@ void InitGame()
   FrameCounter = 0;
   TimeFrames = 0;
   TimeLeft = level.time;
+  ScreenMovPos = 0;
   PlayerMovDir = MV_NO_MOVING;
+  PlayerMovPos = 0;
+  PlayerGfxPos = 0;
   PlayerFrame = 0;
   PlayerPushing = FALSE;
   PlayerGone = LevelSolved = GameOver = SiebAktiv = FALSE;
@@ -104,8 +106,8 @@ void InitGame()
       case EL_SPIELFIGUR:
       case EL_SPIELER1:
 	Feld[x][y] = EL_LEERRAUM;
-	JX = x;
-	JY = y;
+	JX = lastJX = x;
+	JY = lastJY = y;
 	break;
       case EL_SPIELER2:
 	Feld[x][y] = EL_LEERRAUM;
@@ -164,7 +166,7 @@ void InitGame()
 	}
 	break;
       case EL_DYNAMIT:
-	MovDelay[x][y] = 48;
+	MovDelay[x][y] = 96;
 	break;
       case EL_BIRNE_AUS:
 	Lights++;
@@ -587,12 +589,12 @@ void DrawDynamite(int x, int y)
 
   if (Feld[x][y]==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;
   }
 
@@ -609,12 +611,12 @@ void CheckDynamite(int x, int y)
     MovDelay[x][y]--;
     if (MovDelay[x][y])
     {
-      if (!(MovDelay[x][y] % 6))
+      if (!(MovDelay[x][y] % 12))
 	PlaySoundLevel(x,y,SND_ZISCH);
 
-      if (Feld[x][y]==EL_DYNAMIT && !(MovDelay[x][y] % 6))
+      if (Feld[x][y]==EL_DYNAMIT && !(MovDelay[x][y] % 12))
 	DrawDynamite(x,y);
-      else if (Feld[x][y]==EL_DYNABOMB && !(MovDelay[x][y] % 3))
+      else if (Feld[x][y]==EL_DYNABOMB && !(MovDelay[x][y] % 6))
 	DrawDynamite(x,y);
 
       return;
@@ -628,7 +630,7 @@ void CheckDynamite(int x, int y)
 void Explode(int ex, int ey, int phase, int mode)
 {
   int x,y;
-  int num_phase = 9, delay = 1;
+  int num_phase = 9, delay = 2;
   int last_phase = num_phase*delay;
   int half_phase = (num_phase/2)*delay;
 
@@ -858,13 +860,13 @@ void Blurb(int x, int y)
     int graphic = (element==EL_BLURB_LEFT ? GFX_BLURB_LEFT : GFX_BLURB_RIGHT);
 
     if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
-      MovDelay[x][y] = 5;
+      MovDelay[x][y] = 9;
 
     if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
     {
       MovDelay[x][y]--;
       if (MovDelay[x][y] && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-	DrawGraphic(SCROLLX(x),SCROLLY(y),graphic+4-MovDelay[x][y]);
+	DrawGraphic(SCROLLX(x),SCROLLY(y),graphic+4-MovDelay[x][y]/2);
 
       if (!MovDelay[x][y])
       {
@@ -1083,7 +1085,7 @@ void TurnRound(int x, int y)
       MovDir[x][y] = left_dir;
 
     if (element==EL_KAEFER && MovDir[x][y] != old_move_dir)
-      MovDelay[x][y] = 5;
+      MovDelay[x][y] = 9;
     else if (element==EL_BUTTERFLY)	/* && MovDir[x][y]==left_dir) */
       MovDelay[x][y] = 1;
   }
@@ -1099,7 +1101,7 @@ void TurnRound(int x, int y)
       MovDir[x][y] = right_dir;
 
     if (element==EL_FLIEGER && MovDir[x][y] != old_move_dir)
-      MovDelay[x][y] = 5;
+      MovDelay[x][y] = 9;
     else if (element==EL_FIREFLY)	/* && MovDir[x][y]==right_dir) */
       MovDelay[x][y] = 1;
   }
@@ -1125,7 +1127,7 @@ void TurnRound(int x, int y)
     else
       MovDir[x][y] = back_dir;
 
-    MovDelay[x][y] = 8+8*RND(3);
+    MovDelay[x][y] = 16+16*RND(3);
   }
   else if (element==EL_MAMPFER2)
   {
@@ -1149,7 +1151,7 @@ void TurnRound(int x, int y)
     else
       MovDir[x][y] = back_dir;
 
-    MovDelay[x][y] = 8+8*RND(3);
+    MovDelay[x][y] = 16+16*RND(3);
   }
   else if (element==EL_PACMAN)
   {
@@ -1173,7 +1175,7 @@ void TurnRound(int x, int y)
     else
       MovDir[x][y] = back_dir;
 
-    MovDelay[x][y] = 3+RND(20);
+    MovDelay[x][y] = 6+RND(40);
   }
   else if (element==EL_SCHWEIN)
   {
@@ -1336,9 +1338,9 @@ void TurnRound(int x, int y)
       Moving2Blocked(x,y,&newx,&newy);
 
       if (IN_LEV_FIELD(newx,newy) && IS_FREE_OR_PLAYER(newx,newy))
-	MovDelay[x][y] = 4+4*!RND(3);
+	MovDelay[x][y] = 8+8*!RND(3);
       else
-	MovDelay[x][y] = 8;
+	MovDelay[x][y] = 16;
     }
     else
     {
@@ -1389,6 +1391,15 @@ void StartMoving(int x, int y)
 
   if (CAN_FALL(element) && y<lev_fieldy-1)
   {
+    if (PlayerPushing && PlayerMovPos)
+    {
+      int nextJX = JX + (JX - lastJX);
+      int nextJY = JY + (JY - lastJY);
+
+      if (x == nextJX && y == nextJY)
+	return;
+    }
+
     if (element==EL_MORAST_VOLL)
     {
       if (IS_FREE(x,y+1))
@@ -1400,7 +1411,7 @@ void StartMoving(int x, int y)
       else if (Feld[x][y+1]==EL_MORAST_LEER)
       {
 	if (!MovDelay[x][y])
-	  MovDelay[x][y] = 16;
+	  MovDelay[x][y] = TILEY + 1;
 
 	if (MovDelay[x][y])
 	{
@@ -1429,7 +1440,7 @@ void StartMoving(int x, int y)
       else if (Feld[x][y+1]==EL_SIEB_LEER)
       {
 	if (!MovDelay[x][y])
-	  MovDelay[x][y] = 2;
+	  MovDelay[x][y] = TILEY/4 + 1;
 
 	if (MovDelay[x][y])
 	{
@@ -1455,7 +1466,7 @@ void StartMoving(int x, int y)
       else if (Feld[x][y+1]==EL_SIEB2_LEER)
       {
 	if (!MovDelay[x][y])
-	  MovDelay[x][y] = 2;
+	  MovDelay[x][y] = TILEY/4 + 1;
 
 	if (MovDelay[x][y])
 	{
@@ -1709,7 +1720,7 @@ void StartMoving(int x, int y)
 	  else
 	    DrawLevelField(x,y);
 
-	  MovDelay[x][y] = 25;
+	  MovDelay[x][y] = 50;
 	  Feld[newx][newy] = EL_BURNING;
 	  if (IN_LEV_FIELD(newx1,newy1) && Feld[newx1][newy1] == EL_LEERRAUM)
 	    Feld[newx1][newy1] = EL_BURNING;
@@ -1768,9 +1779,15 @@ void StartMoving(int x, int y)
       if (element == EL_KAEFER || element == EL_FLIEGER)
 	DrawLevelField(x,y);
       else if (element == EL_BUTTERFLY || element == EL_FIREFLY)
-	DrawGraphicAnimation(x,y, el2gfx(element), 2, 2, ANIM_NORMAL);
+	DrawGraphicAnimation(x,y, el2gfx(element), 2, 4, ANIM_NORMAL);
       else if (element==EL_SONDE)
-	DrawGraphicAnimation(x,y, GFX_SONDE_START, 8, 1, ANIM_NORMAL);
+      {
+	int nextJX = JX + (JX - lastJX);
+	int nextJY = JY + (JY - lastJY);
+
+	if (!(PlayerPushing && PlayerGfxPos && x == nextJX && y == nextJY))
+	  DrawGraphicAnimation(x,y, GFX_SONDE_START, 8, 2, ANIM_NORMAL);
+      }
 
       return;
     }
@@ -1793,7 +1810,7 @@ void ContinueMoving(int x, int y)
   int dy = (direction==MV_UP   ? -1 : direction==MV_DOWN  ? +1 : 0);
   int horiz_move = (dx!=0);
   int newx = x + dx, newy = y + dy;
-  int step = (horiz_move ? dx : dy)*TILEX/4;
+  int step = (horiz_move ? dx : dy) * TILEX/8;
 
   if (CAN_FALL(element) && horiz_move)
     step*=2;
@@ -2022,7 +2039,7 @@ void AmoebeWaechst(int x, int y)
 
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
   {
-    MovDelay[x][y] = 4;
+    MovDelay[x][y] = 7;
 
     if (DelayReached(&sound_delay,sound_delay_value))
     {
@@ -2035,7 +2052,7 @@ void AmoebeWaechst(int x, int y)
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y] && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AMOEBING+3-MovDelay[x][y]);
+      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AMOEBING+3-MovDelay[x][y]/2);
 
     if (!MovDelay[x][y])
     {
@@ -2179,7 +2196,7 @@ void Life(int ax, int ay)
 {
   int x1,y1,x2,y2;
   static int life[4] = { 2,3,3,3 };	/* "Life"-Parameter */
-  int life_time = 20;
+  int life_time = 40;
   int element = Feld[ax][ay];
 
   if (Stop[ax][ay])
@@ -2267,7 +2284,7 @@ void Ablenk(int x, int y)
 void Birne(int x, int y)
 {
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 400;
+    MovDelay[x][y] = 800;
 
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
@@ -2295,19 +2312,19 @@ void Birne(int x, int y)
 
 void Blubber(int x, int y)
 {
-  DrawGraphicAnimation(x,y, GFX_GEBLUBBER, 4, 5, ANIM_NORMAL);
+  DrawGraphicAnimation(x,y, GFX_GEBLUBBER, 4, 10, ANIM_NORMAL);
 }
 
 void NussKnacken(int x, int y)
 {
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 4;
+    MovDelay[x][y] = 7;
 
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y] && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_CRACKINGNUT+3-MovDelay[x][y]);
+      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_CRACKINGNUT+3-MovDelay[x][y]/2);
 
     if (!MovDelay[x][y])
     {
@@ -2319,9 +2336,9 @@ void NussKnacken(int x, int y)
 
 void SiebAktivieren(int x, int y, int typ)
 {
-  if (SiebAktiv%2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+  if (!(SiebAktiv % 4) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
     DrawGraphic(SCROLLX(x),SCROLLY(y),
-		(typ==1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL)+3-(SiebAktiv%8)/2);
+		(typ==1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL)+3-(SiebAktiv%16)/4);
 }
 
 void AusgangstuerPruefen(int x, int y)
@@ -2329,24 +2346,28 @@ void AusgangstuerPruefen(int x, int y)
   if (!Gems && !SokobanFields && !Lights)
   {
     Feld[x][y] = EL_AUSGANG_ACT;
-    PlaySoundLevel(x,y,SND_OEFFNEN);
+
+    if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+      PlaySoundLevel(x,y,SND_OEFFNEN);
+    else
+      PlaySoundLevel(JX,JY,SND_OEFFNEN);
   }
 }
 
 void AusgangstuerOeffnen(int x, int y)
 {
-  int speed = 3;
+  int delay = 6;
 
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 5*speed;
+    MovDelay[x][y] = 5*delay;
 
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
     int tuer;
 
     MovDelay[x][y]--;
-    tuer = MovDelay[x][y]/speed;
-    if (!(MovDelay[x][y]%speed) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+    tuer = MovDelay[x][y]/delay;
+    if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
       DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AUSGANG_AUF-tuer);
 
     if (!MovDelay[x][y])
@@ -2359,7 +2380,7 @@ void AusgangstuerOeffnen(int x, int y)
 
 void AusgangstuerBlinken(int x, int y)
 {
-  DrawGraphicAnimation(x,y, GFX_AUSGANG_AUF, 4, 2, ANIM_OSCILLATE);
+  DrawGraphicAnimation(x,y, GFX_AUSGANG_AUF, 4, 4, ANIM_OSCILLATE);
 }
 
 void EdelsteinFunkeln(int x, int y)
@@ -2368,37 +2389,30 @@ void EdelsteinFunkeln(int x, int y)
     return;
 
   if (Feld[x][y] == EL_EDELSTEIN_BD)
-  {
-    const int delay = 2;
-    const int frames = 4;
-    int phase = (FrameCounter % (delay*frames)) / delay;
-
-    if (!(FrameCounter % delay))
-      DrawGraphic(SCROLLX(x),SCROLLY(y), GFX_EDELSTEIN_BD - phase);
-  }
+    DrawGraphicAnimation(x,y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE);
   else
   {
     if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
-      MovDelay[x][y] = 6*!SimpleRND(500);
+      MovDelay[x][y] = 11 * !SimpleRND(500);
 
     if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
     {
       MovDelay[x][y]--;
 
       if (direct_draw_on && MovDelay[x][y])
-	drawto_field = backbuffer;
+	SetDrawtoField(DRAW_BUFFERED);
 
       DrawGraphic(SCROLLX(x),SCROLLY(y), el2gfx(Feld[x][y]));
 
       if (MovDelay[x][y])
       {
 	int src_x,src_y, dest_x,dest_y;
-	int phase = MovDelay[x][y]-1;
+	int phase = (MovDelay[x][y]-1)/2;
 
 	src_x  = SX+GFX_PER_LINE*TILEX;
 	src_y  = SY+(phase > 2 ? 4-phase : phase)*TILEY;
-	dest_x = SX+SCROLLX(x)*TILEX;
-	dest_y = SY+SCROLLY(y)*TILEY;
+	dest_x = FX+SCROLLX(x)*TILEX;
+	dest_y = FY+SCROLLY(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],
@@ -2406,9 +2420,9 @@ void EdelsteinFunkeln(int x, int y)
 
 	if (direct_draw_on)
 	{
-	  XCopyArea(display,backbuffer,window,gc,
+	  XCopyArea(display,drawto_field,window,gc,
 		    dest_x,dest_y, TILEX,TILEY, dest_x,dest_y);
-	  drawto_field = window;
+	  SetDrawtoField(DRAW_DIRECT);
 	}
       }
     }
@@ -2417,18 +2431,18 @@ void EdelsteinFunkeln(int x, int y)
 
 void MauerWaechst(int x, int y)
 {
-  int speed = 3;
+  int delay = 6;
 
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 3*speed;
+    MovDelay[x][y] = 3*delay;
 
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
     int phase;
 
     MovDelay[x][y]--;
-    phase = 2-MovDelay[x][y]/speed;
-    if (!(MovDelay[x][y]%speed) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+    phase = 2-MovDelay[x][y]/delay;
+    if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
       DrawGraphic(SCROLLX(x),SCROLLY(y),
 		  (Store[x][y]==MV_LEFT ? GFX_MAUER_L1 : GFX_MAUER_R1)+phase);
 
@@ -2458,7 +2472,7 @@ void MauerAbleger(int ax, int ay)
   BOOL links_massiv = FALSE, rechts_massiv = FALSE;
 
   if (!MovDelay[ax][ay])	/* neue Mauer / noch nicht gewartet */
-    MovDelay[ax][ay] = 3;
+    MovDelay[ax][ay] = 6;
 
   if (MovDelay[ax][ay])		/* neue Mauer / in Wartezustand */
   {
@@ -2550,155 +2564,156 @@ void CheckForDragon(int x, int y)
 
 void GameActions()
 {
-  static long action_delay=0;
+  static long action_delay = 0;
   long action_delay_value;
+  int sieb_x = 0, sieb_y = 0;
+  int x, y, element;
 
   if (game_status != PLAYING)
     return;
 
-/*
+#ifdef DEBUG
+  action_delay_value =
+    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GameSpeed);
+#else
   action_delay_value =
     (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GAME_FRAME_DELAY);
-*/
+#endif
 
-  action_delay_value =
-    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : Gamespeed);
+  if (PlayerMovPos)
+    ScrollFigure(0);
 
-  if (DelayReached(&action_delay, action_delay_value))
-  {
-    int x,y,element;
-    int sieb_x = 0, sieb_y = 0;
+  while(!DelayReached(&action_delay, action_delay_value))
+    Delay(5000);
 
-    if (tape.pausing || (tape.playing && !TapePlayDelay()))
-      return;
-    else if (tape.recording)
-      TapeRecordDelay();
+  if (tape.pausing || (tape.playing && !TapePlayDelay()))
+    return;
+  else if (tape.recording)
+    TapeRecordDelay();
 
-    FrameCounter++;
-    TimeFrames++;
+  FrameCounter++;
+  TimeFrames++;
 
-    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
-    {
-      Stop[x][y] = FALSE;
-      if (JustHit[x][y]>0)
-	JustHit[x][y]--;
+  for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+  {
+    Stop[x][y] = FALSE;
+    if (JustHit[x][y]>0)
+      JustHit[x][y]--;
 
 #if DEBUG
-      if (IS_BLOCKED(x,y))
-      {
-	int oldx,oldy;
+    if (IS_BLOCKED(x,y))
+    {
+      int oldx,oldy;
 
-	Blocked2Moving(x,y,&oldx,&oldy);
-	if (!IS_MOVING(oldx,oldy))
-	{
-	  printf("GameActions(): (BLOCKED=>MOVING) context corrupted!\n");
-	  printf("GameActions(): BLOCKED: x = %d, y = %d\n",x,y);
-	  printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n",oldx,oldy);
-	  printf("GameActions(): This should never happen!\n");
-	}
+      Blocked2Moving(x,y,&oldx,&oldy);
+      if (!IS_MOVING(oldx,oldy))
+      {
+	printf("GameActions(): (BLOCKED=>MOVING) context corrupted!\n");
+	printf("GameActions(): BLOCKED: x = %d, y = %d\n",x,y);
+	printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n",oldx,oldy);
+	printf("GameActions(): This should never happen!\n");
       }
+    }
 #endif
+  }
 
-    }
+  for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+  {
+    element = Feld[x][y];
 
-    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
-    {
-      element = Feld[x][y];
+    if (IS_INACTIVE(element))
+      continue;
 
-      if (IS_INACTIVE(element))
-	continue;
+    if (!IS_MOVING(x,y) && (CAN_FALL(element) || CAN_MOVE(element)))
+    {
+      StartMoving(x,y);
+
+      if (IS_GEM(element))
+	EdelsteinFunkeln(x,y);
+    }
+    else if (IS_MOVING(x,y))
+      ContinueMoving(x,y);
+    else if (element==EL_DYNAMIT || element==EL_DYNABOMB)
+      CheckDynamite(x,y);
+    else if (element==EL_EXPLODING)
+      Explode(x,y,Frame[x][y],EX_NORMAL);
+    else if (element==EL_AMOEBING)
+      AmoebeWaechst(x,y);
+    else if (IS_AMOEBALIVE(element))
+      AmoebeAbleger(x,y);
+    else if (element==EL_LIFE || element==EL_LIFE_ASYNC)
+      Life(x,y);
+    else if (element==EL_ABLENK_EIN)
+      Ablenk(x,y);
+    else if (element==EL_SALZSAEURE)
+      Blubber(x,y);
+    else if (element==EL_BLURB_LEFT || element==EL_BLURB_RIGHT)
+      Blurb(x,y);
+    else if (element==EL_CRACKINGNUT)
+      NussKnacken(x,y);
+    else if (element==EL_AUSGANG_ZU)
+      AusgangstuerPruefen(x,y);
+    else if (element==EL_AUSGANG_ACT)
+      AusgangstuerOeffnen(x,y);
+    else if (element==EL_AUSGANG_AUF)
+      AusgangstuerBlinken(x,y);
+    else if (element==EL_MAUERND)
+      MauerWaechst(x,y);
+    else if (element==EL_MAUER_LEBT)
+      MauerAbleger(x,y);
+    else if (element==EL_BURNING)
+      CheckForDragon(x,y);
 
-      if (!IS_MOVING(x,y) && (CAN_FALL(element) || CAN_MOVE(element)))
-      {
-	StartMoving(x,y);
+    if (SiebAktiv)
+    {
+      BOOL sieb = FALSE;
 
-	if (IS_GEM(element))
-	  EdelsteinFunkeln(x,y);
+      if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL ||
+	  Store[x][y]==EL_SIEB_LEER)
+      {
+	SiebAktivieren(x, y, 1);
+	sieb = TRUE;
       }
-      else if (IS_MOVING(x,y))
-	ContinueMoving(x,y);
-      else if (element==EL_DYNAMIT || element==EL_DYNABOMB)
-	CheckDynamite(x,y);
-      else if (element==EL_EXPLODING)
-	Explode(x,y,Frame[x][y],EX_NORMAL);
-      else if (element==EL_AMOEBING)
-	AmoebeWaechst(x,y);
-      else if (IS_AMOEBALIVE(element))
-	AmoebeAbleger(x,y);
-      else if (element==EL_LIFE || element==EL_LIFE_ASYNC)
-	Life(x,y);
-      else if (element==EL_ABLENK_EIN)
-	Ablenk(x,y);
-      else if (element==EL_SALZSAEURE)
-	Blubber(x,y);
-      else if (element==EL_BLURB_LEFT || element==EL_BLURB_RIGHT)
-	Blurb(x,y);
-      else if (element==EL_CRACKINGNUT)
-	NussKnacken(x,y);
-      else if (element==EL_AUSGANG_ZU)
-	AusgangstuerPruefen(x,y);
-      else if (element==EL_AUSGANG_ACT)
-	AusgangstuerOeffnen(x,y);
-      else if (element==EL_AUSGANG_AUF)
-	AusgangstuerBlinken(x,y);
-      else if (element==EL_MAUERND)
-	MauerWaechst(x,y);
-      else if (element==EL_MAUER_LEBT)
-	MauerAbleger(x,y);
-      else if (element==EL_BURNING)
-	CheckForDragon(x,y);
-
-      if (SiebAktiv)
+      else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL ||
+	       Store[x][y]==EL_SIEB2_LEER)
       {
-	BOOL sieb = FALSE;
-
-	if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL ||
-	    Store[x][y]==EL_SIEB_LEER)
-	{
-	  SiebAktivieren(x, y, 1);
-	  sieb = TRUE;
-	}
-	else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL ||
-		 Store[x][y]==EL_SIEB2_LEER)
-	{
-	  SiebAktivieren(x, y, 2);
-	  sieb = TRUE;
-	}
+	SiebAktivieren(x, y, 2);
+	sieb = TRUE;
+      }
 
-	if (sieb && ABS(x-JX)+ABS(y-JY) < ABS(sieb_x-JX)+ABS(sieb_y-JY))
-	{
-	  sieb_x = x;
-	  sieb_y = y;
-	}
+      if (sieb && ABS(x-JX)+ABS(y-JY) < ABS(sieb_x-JX)+ABS(sieb_y-JY))
+      {
+	sieb_x = x;
+	sieb_y = y;
       }
     }
+  }
 
-    if (SiebAktiv)
+  if (SiebAktiv)
+  {
+    if (!(SiebAktiv%4))
+      PlaySoundLevel(sieb_x,sieb_y,SND_MIEP);
+    SiebAktiv--;
+    if (!SiebAktiv)
     {
-      if (!(SiebAktiv%4))
-	PlaySoundLevel(sieb_x,sieb_y,SND_MIEP);
-      SiebAktiv--;
-      if (!SiebAktiv)
+      for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
       {
-	for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+	element = Feld[x][y];
+	if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL)
 	{
-	  element = Feld[x][y];
-	  if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL)
-	  {
-	    Feld[x][y] = EL_SIEB_TOT;
-	    DrawLevelField(x,y);
-	  }
-	  else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL)
-	  {
-	    Feld[x][y] = EL_SIEB2_TOT;
-	    DrawLevelField(x,y);
-	  }
+	  Feld[x][y] = EL_SIEB_TOT;
+	  DrawLevelField(x,y);
+	}
+	else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL)
+	{
+	  Feld[x][y] = EL_SIEB2_TOT;
+	  DrawLevelField(x,y);
 	}
       }
     }
   }
 
-  if (TimeLeft>0 && TimeFrames>=25 && !tape.pausing)
+  if (TimeLeft>0 && TimeFrames>=(100/GameSpeed) && !tape.pausing)
   {
     TimeFrames = 0;
     TimeLeft--;
@@ -2715,44 +2730,46 @@ void GameActions()
       KillHero();
   }
 
-  BackToFront();
+  DrawPlayerField();
 }
 
 void ScrollLevel(int dx, int dy)
 {
+  int softscroll_offset = (soft_scrolling_on ? TILEX : 0);
   int x,y;
 
+  ScreenMovPos = PlayerGfxPos;
+
   XCopyArea(display,drawto_field,drawto_field,gc,
-	    SX+TILEX*(dx==-1),SY+TILEY*(dy==-1),
-	    SXSIZE-TILEX*(dx!=0),SYSIZE-TILEY*(dy!=0),
-	    SX+TILEX*(dx==1),SY+TILEY*(dy==1));
+	    FX + TILEX*(dx==-1) - softscroll_offset,
+	    FY + TILEY*(dy==-1) - softscroll_offset,
+	    SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset,
+	    SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset,
+	    FX + TILEX*(dx==1) - softscroll_offset,
+	    FY + TILEY*(dy==1) - softscroll_offset);
 
   if (dx)
   {
-    x = (dx==1 ? 0 : SCR_FIELDX-1);
-    for(y=0;y<SCR_FIELDY;y++)
+    x = (dx==1 ? BX1 : BX2);
+    for(y=BY1; y<=BY2; y++)
       DrawScreenField(x,y);
   }
   if (dy)
   {
-    y = (dy==1 ? 0 : SCR_FIELDY-1);
-    for(x=0;x<SCR_FIELDX;x++)
+    y = (dy==1 ? BY1 : BY2);
+    for(x=BX1; x<=BX2; x++)
       DrawScreenField(x,y);
   }
 
-  redraw_mask|=REDRAW_FIELD;
+  redraw_mask |= REDRAW_FIELD;
 }
 
 BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
 {
-  int oldJX,oldJY, newJX = JX+dx,newJY = JY+dy;
+  int newJX = JX+dx, newJY = JY+dy;
   int element;
   int can_move;
 
-/*
-  int old_move_dir = PlayerMovDir;
-*/
-
   if (PlayerGone || (!dx && !dy))
     return(MF_NO_ACTION);
 
@@ -2760,12 +2777,6 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
 		  dx > 0 ? MV_RIGHT :
 		  dy < 0 ? MV_UP :
 		  dy > 0 ? MV_DOWN :	MV_NO_MOVING);
-/*
-  if (old_move_dir != PlayerMovDir)
-    PlayerFrame = 0;
-  else
-    PlayerFrame = (PlayerFrame + 1) % 4;
-*/
 
   if (!IN_LEV_FIELD(newJX,newJY))
     return(MF_NO_ACTION);
@@ -2793,91 +2804,58 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
   if (can_move != MF_MOVING)
     return(can_move);
 
-  oldJX = JX;
-  oldJY = JY;
+  lastJX = JX;
+  lastJY = JY;
   JX = newJX;
   JY = newJY;
 
-
-  JX2 = oldJX;
-  JY2 = oldJY;
-
-  PlayerMovPos = TILEX/4;
-  PlayerMovPos = (dx > 0 || dy > 0 ? -1 : 1) * 3*TILEX/4;
+  PlayerMovPos = (dx > 0 || dy > 0 ? -1 : 1) * 7*TILEX/8;
 
   ScrollFigure(-1);
 
-  if (Store[oldJX][oldJY])
-  {
-    DrawGraphic(SCROLLX(oldJX),SCROLLY(oldJY),el2gfx(Store[oldJX][oldJY]));
-    DrawGraphicThruMask(SCROLLX(oldJX),SCROLLY(oldJY),
-			el2gfx(Feld[oldJX][oldJY]));
-  }
-  else if (Feld[oldJX][oldJY]==EL_DYNAMIT)
-    DrawDynamite(oldJX,oldJY);
-  else
-    DrawLevelField(oldJX,oldJY);
-
   return(MF_MOVING);
 }
 
 BOOL MoveFigure(int dx, int dy)
 {
   static long move_delay = 0;
+  static int last_move_dir = MV_NO_MOVING;
   int moved = MF_NO_ACTION;
   int oldJX = JX, oldJY = JY;
 
   if (PlayerGone || (!dx && !dy))
     return(FALSE);
 
-/*
-  if (!DelayReached(&move_delay,8) && !tape.playing)
-    return(FALSE);
-*/
-
-/*
-  if (!DelayReached(&move_delay,10) && !tape.playing)
-    return(FALSE);
-*/
-
-/*
-  if (!FrameReached(&move_delay,2) && !tape.playing)
+  if (!FrameReached(&move_delay,MoveSpeed) && !tape.playing)
     return(FALSE);
-*/
 
-  if (Movemethod == 0)
+  if (last_move_dir & (MV_LEFT | MV_RIGHT))
   {
-    if (!DelayReached(&move_delay,Movespeed[0]) && !tape.playing)
-      return(FALSE);
+    if (!(moved |= MoveFigureOneStep(0,dy, dx,dy)))
+      moved |= MoveFigureOneStep(dx,0, dx,dy);
   }
   else
   {
-    if (!FrameReached(&move_delay,Movespeed[1]) && !tape.playing)
-      return(FALSE);
+    if (!(moved |= MoveFigureOneStep(dx,0, dx,dy)))
+      moved |= MoveFigureOneStep(0,dy, dx,dy);
   }
 
-  if (moved |= MoveFigureOneStep(dx,0, dx,dy))
-    moved |= MoveFigureOneStep(0,dy, dx,dy);
-  else
-  {
-    moved |= MoveFigureOneStep(0,dy, dx,dy);
-    moved |= MoveFigureOneStep(dx,0, dx,dy);
-  }
+  last_move_dir = MV_NO_MOVING;
 
   if (moved & MF_MOVING)
   {
-    int old_scroll_x=scroll_x, old_scroll_y=scroll_y;
+    int old_scroll_x = scroll_x, old_scroll_y = scroll_y;
     int offset = (scroll_delay_on ? 3 : 0);
 
     if ((scroll_x < JX-MIDPOSX-offset || scroll_x > JX-MIDPOSX+offset) &&
-	JX>=MIDPOSX-1-offset && JX<=lev_fieldx-(MIDPOSX-offset))
+	JX >= MIDPOSX-1-offset && JX <= lev_fieldx-(MIDPOSX-offset))
       scroll_x = JX-MIDPOSX + (scroll_x < JX-MIDPOSX ? -offset : offset);
     if ((scroll_y < JY-MIDPOSY-offset || scroll_y > JY-MIDPOSY+offset) &&
-	JY>=MIDPOSY-1-offset && JY<=lev_fieldy-(MIDPOSY-offset))
+	JY >= MIDPOSY-1-offset && JY <= lev_fieldy-(MIDPOSY-offset))
       scroll_y = JY-MIDPOSY + (scroll_y < JY-MIDPOSY ? -offset : offset);
 
-    if (scroll_x!=old_scroll_x || scroll_y!=old_scroll_y)
-      ScrollLevel(old_scroll_x-scroll_x,old_scroll_y-scroll_y);
+    if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
+      ScrollLevel(old_scroll_x - scroll_x, old_scroll_y - scroll_y);
   }
 
   if (!(moved & MF_MOVING) && !PlayerPushing)
@@ -2893,12 +2871,12 @@ BOOL MoveFigure(int dx, int dy)
       PlayerMovDir = (oldJY < JY ? MV_DOWN : MV_UP);
 
     DrawLevelField(JX,JY);	/* für "ErdreichAnbroeckeln()" */
+
+    last_move_dir = PlayerMovDir;
   }
 
   TestIfHeroHitsBadThing();
 
-  BackToFront();
-
   if (PlayerGone)
     RemoveHero();
 
@@ -2907,20 +2885,43 @@ BOOL MoveFigure(int dx, int dy)
 
 void ScrollFigure(int init)
 {
-  static long actual_frame_counter;
+  static long actual_frame_counter = 0;
 
   if (init)
   {
+    PlayerGfxPos = ScrollStepSize * (PlayerMovPos / ScrollStepSize);
     actual_frame_counter = FrameCounter;
+
+    if (Feld[lastJX][lastJY] == EL_LEERRAUM &&
+	IN_LEV_FIELD(lastJX,lastJY-1) &&
+	CAN_FALL(Feld[lastJX][lastJY-1]))
+      Feld[lastJX][lastJY] = EL_PLAYER_IS_LEAVING;
+
+    DrawPlayerField();
     return;
   }
   else if (!FrameReached(&actual_frame_counter,1))
     return;
 
-  PlayerMovPos += (PlayerMovPos > 0 ? -1 : 1) * TILEX/4;
+  PlayerMovPos += (PlayerMovPos > 0 ? -1 : 1) * TILEX/8;
+  PlayerGfxPos = ScrollStepSize * (PlayerMovPos / ScrollStepSize);
+
+  if (ScreenMovPos && ScreenMovPos != PlayerGfxPos)
+  {
+    ScreenMovPos = PlayerGfxPos;
+    redraw_mask |= REDRAW_FIELD;
+  }
+
+  if (Feld[lastJX][lastJY] == EL_PLAYER_IS_LEAVING)
+    Feld[lastJX][lastJY] = EL_LEERRAUM;
 
-  DrawLevelElement(JX2,JY2, Feld[JX2][JY2]);
   DrawPlayerField();
+
+  if (!PlayerMovPos)
+  {
+    lastJX = JX;
+    lastJY = JY;
+  }
 }
 
 void TestIfGoodThingHitsBadThing(int goodx, int goody)
@@ -3111,7 +3112,8 @@ int DigField(int x, int y, int real_dx, int real_dy, int mode)
   static long push_delay = 0;
   static int push_delay_value = 5;
 
-  PlayerPushing = FALSE;
+  if (!PlayerMovPos)
+    PlayerPushing = FALSE;
 
   if (mode == DF_NO_PUSH)
   {
@@ -3429,7 +3431,7 @@ BOOL PlaceBomb(void)
 {
   int element;
 
-  if (PlayerGone)
+  if (PlayerGone || PlayerMovPos)
     return(FALSE);
 
   element = Feld[JX][JY];
@@ -3444,7 +3446,7 @@ BOOL PlaceBomb(void)
   if (Dynamite)
   {
     Feld[JX][JY] = EL_DYNAMIT;
-    MovDelay[JX][JY] = 48;
+    MovDelay[JX][JY] = 96;
     Dynamite--;
     DrawText(DX_DYNAMITE,DY_DYNAMITE,int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
     DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNAMIT);
@@ -3452,7 +3454,7 @@ BOOL PlaceBomb(void)
   else
   {
     Feld[JX][JY] = EL_DYNABOMB;
-    MovDelay[JX][JY] = 48;
+    MovDelay[JX][JY] = 96;
     DynaBombsLeft--;
     DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNABOMB);
   }
@@ -3476,7 +3478,13 @@ void PlaySoundLevel(int x, int y, int sound_nr)
     return;
 
   volume = PSND_MAX_VOLUME;
+#ifndef MSDOS
   stereo = (sx-SCR_FIELDX/2)*12;
+#else
+  stereo = PSND_MIDDLE+(2*sx-(SCR_FIELDX-1))*5;
+  if(stereo > PSND_MAX_RIGHT) stereo = PSND_MAX_RIGHT;
+  if(stereo < PSND_MAX_LEFT) stereo = PSND_MAX_LEFT;
+#endif
 
   if (!IN_SCR_FIELD(sx,sy))
   {
@@ -3493,7 +3501,6 @@ void RaiseScore(int value)
 {
   Score += value;
   DrawText(DX_SCORE,DY_SCORE,int2str(Score,5),FS_SMALL,FC_YELLOW);
-  BackToFront();
 }
 
 void RaiseScoreElement(int element)