X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=fd58165902daf1fb29f4b49747943b541fb28d9b;hb=5e8d9d0308f76bb35e7578a8859d6f01977d0f69;hp=6d5ca5bc30f068ad08f84f09564a5fb1947a9dd8;hpb=d0893e6987c21c25ec137438a18cfe1288362139;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 6d5ca5bc..fd581659 100644
--- a/src/game.c
+++ b/src/game.c
@@ -10,8 +10,6 @@
 *               q99492@pbhrzx.uni-paderborn.de             *
 *----------------------------------------------------------*
 *  game.c                                                  *
-*                                                          *
-*  Letzte Aenderung: 15.06.1995                            *
 ***********************************************************/
 
 #include "game.h"
@@ -20,689 +18,162 @@
 #include "screens.h"
 #include "sound.h"
 #include "init.h"
+#include "buttons.h"
+#include "files.h"
+#include "tape.h"
+#include "joystick.h"
 
-BOOL CreateNewScoreFile()
-{
-  int i,j,k;
-  char filename[MAX_FILENAME];
-  char empty_alias[MAX_NAMELEN];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
-
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
-
-  for(i=0;i<MAX_NAMELEN;i++)
-    empty_alias[i] = 0;
-  strncpy(empty_alias,EMPTY_ALIAS,MAX_NAMELEN-1);
-
-  fputs(SCORE_COOKIE,file);		/* Formatkennung */
-  for(i=0;i<LEVELDIR_SIZE(leveldir[leveldir_nr]);i++)
-  {
-    for(j=0;j<MAX_SCORE_ENTRIES;j++)
-    {
-      for(k=0;k<MAX_NAMELEN;k++)
-	fputc(empty_alias[k],file);
-      fputc(0,file);
-      fputc(0,file);
-    }
-  }
-  fclose(file);
-
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
-}
-
-BOOL CreateNewNamesFile(int mode)
-{
-  char filename[MAX_FILENAME];
-  FILE *file;
-
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
-
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
-
-  fputs(NAMES_COOKIE,file);		/* Formatkennung */
-  fclose(file);
-
-  chmod(filename, NAMES_PERMS);
-  return(TRUE);
-}
-
-void LoadLevelInfo()
-{
-  int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-
-  sprintf(filename,"%s/%s",LEVEL_PATH,LEVDIR_FILENAME);
-
-  if (!(file=fopen(filename,"r")))
-  {
-    fprintf(stderr,"%s: cannot load level info '%s'!\n",progname,filename);
-    CloseAll();
-  }
-
-  fscanf(file,"%s\n",cookie);
-  if (strcmp(cookie,LEVELDIR_COOKIE))	/* ungültiges Format? */
-  {
-    fprintf(stderr,"%s: wrong format of level info file!\n",progname);
-    fclose(file);
-    CloseAll();
-  }
-
-  num_leveldirs = 0;
-  leveldir_nr = 0;
-  for(i=0;i<MAX_LEVDIR_ENTRIES;i++)
-  {
-    fscanf(file,"%s",leveldir[i].filename);
-    fscanf(file,"%s",leveldir[i].name);
-    fscanf(file,"%d",&leveldir[i].num_ready);
-    fscanf(file,"%d",&leveldir[i].num_free);
-    if (feof(file))
-      break;
-
-    num_leveldirs++;
-  }
-
-  if (!num_leveldirs)
-  {
-    fprintf(stderr,"%s: empty level info '%s'!\n",progname,filename);
-    CloseAll();
-  }
-}
-
-void LoadLevel(int level_nr)
-{
-  int i,x,y;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%d",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
-
-  if (!(file=fopen(filename,"r")))
-  {
-/*
-    fprintf(stderr,"%s: cannot load level '%s'!\n",progname,filename);
-*/
-  }
-  else
-  {
-    fgets(cookie,LEVEL_COOKIE_LEN,file);
-    fgetc(file);
-    if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
-    {
-      fprintf(stderr,"%s: wrong format of level file '%s'!\n",
-	      progname,filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
-
-  if (file)
-  {
-    lev_fieldx = level.fieldx = fgetc(file);
-    lev_fieldy = level.fieldy = fgetc(file);
-
-    level.time		= (fgetc(file)<<8) | fgetc(file);
-    level.edelsteine	= (fgetc(file)<<8) | fgetc(file);
-    for(i=0;i<MAX_LEVNAMLEN;i++)
-      level.name[i]	= fgetc(file);
-    for(i=0;i<MAX_SC_ENTRIES;i++)
-      level.score[i]	= fgetc(file);
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-	for(x=0;x<3;x++)
-	  level.mampfer_inhalt[i][x][y] = fgetc(file);
-    level.tempo_amoebe	= fgetc(file);
-    level.dauer_sieb	= fgetc(file);
-    level.dauer_ablenk	= fgetc(file);
-
-    for(i=0;i<19;i++)	/* Rest reserviert / Headergröße 80 Bytes */
-      fgetc(file);
-
-    for(y=0;y<lev_fieldy;y++) 
-      for(x=0;x<lev_fieldx;x++) 
-	Feld[x][y] = Ur[x][y] = fgetc(file);
-
-    fclose(file);
-
-    if (level.time<=10)	/* Mindestspieldauer */
-      level.time = 10;
-  }
-  else
-  {
-    lev_fieldx = level.fieldx = STD_LEV_FIELDX;
-    lev_fieldy = level.fieldy = STD_LEV_FIELDY;
-
-    level.time		= 100;
-    level.edelsteine	= 0;
-    strncpy(level.name,"Nameless Level",MAX_LEVNAMLEN-1);
-    for(i=0;i<MAX_SC_ENTRIES;i++)
-      level.score[i]	= 10;
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-	for(x=0;x<3;x++)
-	  level.mampfer_inhalt[i][x][y] = EL_FELSBROCKEN;
-    level.tempo_amoebe	= 10;
-    level.dauer_sieb	= 10;
-    level.dauer_ablenk	= 10;
-
-    for(y=0;y<STD_LEV_FIELDY;y++) 
-      for(x=0;x<STD_LEV_FIELDX;x++) 
-	Feld[x][y] = Ur[x][y] = EL_ERDREICH;
-    Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
-    Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
-      Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_AUSGANG_ZU;
-  }
-}
-
-void LoadLevelTape(int level_nr)
-{
-  int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%d.tape",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
-
-  if ((file=fopen(filename,"r")))
-  {
-    fgets(cookie,LEVELREC_COOKIE_LEN,file);
-    fgetc(file);
-    if (strcmp(cookie,LEVELREC_COOKIE))	/* ungültiges Format? */
-    {
-      fprintf(stderr,"%s: wrong format of level recording file '%s'!\n",
-	      progname,filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
-
-  if (!file)
-    return;
-
-  tape.random_seed =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-  tape.date =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-  tape.length =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-
-  tape.level_nr = level_nr;
-  tape.counter = 0;
-  tape.recording = FALSE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
-
-  for(i=0;i<tape.length;i++)
-  {
-    if (i>=MAX_TAPELEN)
-      break;
-    tape.pos[i].joystickdata = fgetc(file);
-    tape.pos[i].delay        = fgetc(file);
-    if (feof(file))
-      break;
-  }
-
-  if (i != tape.length)
-    fprintf(stderr,"%s: level recording file '%s' corrupted!\n",
-	    progname,filename);
-
-  fclose(file);
-
-  master_tape = tape;
-}
-
-void LoadScore(int level_nr)
-{
-  int i,j;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
-
-  if (!(file=fopen(filename,"r")))
-  {
-    if (!CreateNewScoreFile())
-    {
-      fprintf(stderr,"%s: cannot create score file '%s'!\n",
-	      progname,filename);
-    }
-    else if (!(file=fopen(filename,"r"))) 
-    {
-      fprintf(stderr,"%s: cannot load score for level %d!\n",
-	      progname,level_nr);
-    }
-  }
-
-  if (file)
-  {
-    fgets(cookie,SCORE_COOKIE_LEN,file);
-    if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
-    {
-      fprintf(stderr,"%s: wrong format of score file!\n",progname);
-      fclose(file);
-      file = NULL;
-    }
-  }
-
-  if (file)
-  {
-    fseek(file,
-	  SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-	  SEEK_SET);
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
-    {
-      for(j=0;j<MAX_NAMELEN;j++)
-	highscore[i].Name[j] = fgetc(file);
-      highscore[i].Score = (fgetc(file)<<8) | fgetc(file);
-    }
-    fclose(file);
-  }
-  else
-  {
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
-    {
-      strcpy(highscore[i].Name,EMPTY_ALIAS);
-      highscore[i].Score = 0;
-    }
-  }
-}
-
-void LoadPlayerInfo(int mode)
+void GetPlayerConfig()
 {
-  int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-  char *login_name = GetLoginName();
-  struct PlayerInfo default_player, new_player;
-
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
-
-  for(i=0;i<MAX_NAMELEN;i++)
-    default_player.login_name[i] = default_player.alias_name[i] = 0;
-  strncpy(default_player.login_name,login_name,MAX_NAMELEN-1);
-  strncpy(default_player.alias_name,login_name,MAX_NAMELEN-1);
-  default_player.handicap = 0;
-  default_player.setup = DEFAULT_SETUP;
-  default_player.leveldir_nr = 0;
-
-  new_player = default_player;
-
-  if (!(file=fopen(filename,"r")))
-  {
-    if (!CreateNewNamesFile(mode))
-    {
-      fprintf(stderr,"%s: cannot create names file '%s'!\n",
-	      progname,filename);
-    }
-    else if (!(file=fopen(filename,"r"))) 
-    {
-      fprintf(stderr,"%s: cannot load player information '%s'!\n",
-	      progname,filename);
-    }
-  }
-
-  if (file)
-  {
-    fgets(cookie,NAMES_COOKIE_LEN,file);
-    if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
-    {
-      fprintf(stderr,"%s: wrong format of names file '%s'!\n",
-	      progname,filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
-
-  if (!file)
-  {
-    player = default_player;
-    level_nr = default_player.handicap;
-    return;
-  }
-
-  while(1)
-  {
-    for(i=0;i<MAX_NAMELEN;i++)
-      new_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      new_player.alias_name[i] = fgetc(file);
-    new_player.handicap = fgetc(file);
-    new_player.setup = (fgetc(file)<<8) | fgetc(file);
-    new_player.leveldir_nr = fgetc(file);
-
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
-    {
-      new_player = default_player;
-
-      fclose(file);
-      if (!(file=fopen(filename,"a")))
-      {
-	fprintf(stderr,"%s: cannot append new player to names file '%s'!\n",
-		progname,filename);
-      }
-      else
-      {
-	for(i=0;i<MAX_NAMELEN;i++)
-	  fputc(new_player.login_name[i],file);
-	for(i=0;i<MAX_NAMELEN;i++)
-	  fputc(new_player.alias_name[i],file);
-	fputc(new_player.handicap,file);
-	fputc(new_player.setup / 256,file);
-	fputc(new_player.setup % 256,file);
-	fputc(new_player.leveldir_nr,file);
-      }
-      break;
-    }
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(new_player.login_name,login_name,MAX_NAMELEN-1))
-	break;
-  }
+  int old_joystick_nr = joystick_nr;
 
-  if (mode==PLAYER_SETUP)
+  if (sound_status==SOUND_OFF)
+    local_player->setup &= ~SETUP_SOUND;
+  if (!sound_loops_allowed)
   {
-    player = new_player;
-    if (player.leveldir_nr < num_leveldirs)
-      leveldir_nr = player.leveldir_nr;
-    else
-      leveldir_nr = 0;
+    local_player->setup &= ~SETUP_SOUND_LOOPS;
+    local_player->setup &= ~SETUP_SOUND_MUSIC;
   }
-  else
-    player.handicap = new_player.handicap;
-
-  level_nr = player.handicap;
-  fclose(file);
-}
-
-void SaveLevel(int level_nr)
-{
-  int i,x,y;
-  char filename[MAX_FILENAME];
-  FILE *file;
 
-  sprintf(filename,"%s/%s/%d",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+  sound_on = sound_simple_on = SETUP_SOUND_ON(local_player->setup);
+  sound_loops_on = SETUP_SOUND_LOOPS_ON(local_player->setup);
+  sound_music_on = SETUP_SOUND_MUSIC_ON(local_player->setup);
+  toons_on = SETUP_TOONS_ON(local_player->setup);
+  direct_draw_on = SETUP_DIRECT_DRAW_ON(local_player->setup);
+  fading_on = SETUP_FADING_ON(local_player->setup);
+  autorecord_on = SETUP_AUTO_RECORD_ON(local_player->setup);
+  joystick_nr = SETUP_2ND_JOYSTICK_ON(local_player->setup);
+  quick_doors = SETUP_QUICK_DOORS_ON(local_player->setup);
+  scroll_delay_on = SETUP_SCROLL_DELAY_ON(local_player->setup);
+  soft_scrolling_on = SETUP_SOFT_SCROLL_ON(local_player->setup);
 
-  if (!(file=fopen(filename,"w")))
+#ifndef MSDOS
+  if (joystick_nr != old_joystick_nr)
   {
-    fprintf(stderr,"%s: cannot save level file '%s'!\n",progname,filename);
-    return;
+    if (joystick_device)
+      close(joystick_device);
+    InitJoystick();
   }
-
-  fputs(LEVEL_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
-
-  fputc(level.fieldx,file);
-  fputc(level.fieldy,file);
-  fputc(level.time / 256,file);
-  fputc(level.time % 256,file);
-  fputc(level.edelsteine / 256,file);
-  fputc(level.edelsteine % 256,file);
-
-  for(i=0;i<MAX_LEVNAMLEN;i++)
-    fputc(level.name[i],file);
-  for(i=0;i<MAX_SC_ENTRIES;i++)
-    fputc(level.score[i],file);
-  for(i=0;i<4;i++)
-    for(y=0;y<3;y++)
-      for(x=0;x<3;x++)
-	fputc(level.mampfer_inhalt[i][x][y],file);
-  fputc(level.tempo_amoebe,file);
-  fputc(level.dauer_sieb,file);
-  fputc(level.dauer_ablenk,file);
-
-  for(i=0;i<19;i++)	/* Rest reserviert / Headergröße 80 Bytes */
-    fputc(0,file);
-
-  for(y=0;y<lev_fieldy;y++) 
-    for(x=0;x<lev_fieldx;x++) 
-      fputc(Ur[x][y],file);
-
-  fclose(file);
-
-  chmod(filename, LEVEL_PERMS);
+#endif
 }
 
-void SaveLevelTape(int level_nr)
+void InitGame()
 {
-  int i;
-  char filename[MAX_FILENAME];
-  FILE *file;
-  BOOL new_tape = TRUE;
-
-  sprintf(filename,"%s/%s/%d.tape",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
-
-  /* Testen, ob bereits eine Aufnahme existiert */
-  if ((file=fopen(filename,"r")))
-  {
-    new_tape = FALSE;
-    fclose(file);
-
-    if (!AreYouSure("Replace old tape ?",AYS_ASK))
-      return;
-  }
-
-  if (!(file=fopen(filename,"w")))
-  {
-    fprintf(stderr,"%s: cannot save level recording file '%s'!\n",
-	    progname,filename);
-    return;
-  }
-
-  fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
-
-  tape = master_tape;
-
-  fputc((tape.random_seed >> 24) & 0xff,file);
-  fputc((tape.random_seed >> 16) & 0xff,file);
-  fputc((tape.random_seed >>  8) & 0xff,file);
-  fputc((tape.random_seed >>  0) & 0xff,file);
-
-  fputc((tape.date >>  24) & 0xff,file);
-  fputc((tape.date >>  16) & 0xff,file);
-  fputc((tape.date >>   8) & 0xff,file);
-  fputc((tape.date >>   0) & 0xff,file);
-
-  fputc((tape.length >>  24) & 0xff,file);
-  fputc((tape.length >>  16) & 0xff,file);
-  fputc((tape.length >>   8) & 0xff,file);
-  fputc((tape.length >>   0) & 0xff,file);
-
-  for(i=0;i<tape.length;i++)
-  {
-    fputc(tape.pos[i].joystickdata,file);
-    fputc(tape.pos[i].delay,file);
-  }
-
-  fclose(file);
-
-  chmod(filename, LEVREC_PERMS);
-
-  if (new_tape)
-    AreYouSure("tape saved !",AYS_CONFIRM);
-}
+  int i, x,y;
+  BOOL emulate_bd = TRUE;	/* unless non-BOULDERDASH elements found */
+  BOOL emulate_sb = TRUE;	/* unless non-SOKOBAN     elements found */
 
-void SaveScore(int level_nr)
-{
-  int i,j;
-  char filename[MAX_FILENAME];
-  FILE *file;
+  for(i=0; i<MAX_PLAYERS; i++)
+    stored_player[i].active = FALSE;
 
-  sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  local_player->nr = 1;
+  local_player->active = TRUE;
+  local_player->local = TRUE;
 
-  if (!(file=fopen(filename,"r+")))
-  {
-    fprintf(stderr,"%s: cannot save score for level %d!\n",
-	    progname,level_nr);
-    return;
-  }
+  player = local_player;
 
-  fseek(file,
-	SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-	SEEK_SET);
-  for(i=0;i<MAX_SCORE_ENTRIES;i++)
-  {
-    for(j=0;j<MAX_NAMELEN;j++)
-      fputc(highscore[i].Name[j],file);
-    fputc(highscore[i].Score / 256,file);
-    fputc(highscore[i].Score % 256,file);
-  }
-  fclose(file);
-}
+  player->score = 0;
+  player->gems_still_needed = level.edelsteine;
+  player->sokobanfields_still_needed = 0;
+  player->lights_still_needed = 0;
+  player->friends_still_needed = 0;
 
-void SavePlayerInfo(int mode)
-{
-  int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-  struct PlayerInfo default_player;
-
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+  for(i=0; i<4; i++)
+    player->key[i] = FALSE;
 
-  if (!(file=fopen(filename,"r+")))
-  {
-    fprintf(stderr,"%s: cannot save player information '%s'!\n",
-	    progname,filename);
-    return;
-  }
+  player->dynamite = 0;
+  player->dynabomb_count = 0;
+  player->dynabomb_size = 0;
+  player->dynabombs_left = 0;
+  player->dynabomb_xl = FALSE;
 
-  fgets(cookie,NAMES_COOKIE_LEN,file);
-  if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
-  {
-    fprintf(stderr,"%s: wrong format of names file '%s'!\n",
-	    progname,filename);
-    fclose(file);
-    return;
-  }
+  MampferNr = 0;
+  FrameCounter = 0;
+  TimeFrames = 0;
+  TimeLeft = level.time;
+  ScreenMovPos = 0;
 
-  while(1)
-  {
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.alias_name[i] = fgetc(file);
-    default_player.handicap = fgetc(file);
-    default_player.setup = (fgetc(file)<<8) | fgetc(file);
-    default_player.leveldir_nr = fgetc(file);
+  player->MovDir = MV_NO_MOVING;
+  player->MovPos = 0;
+  player->Pushing = FALSE;
+  player->GfxPos = 0;
+  player->Frame = 0;
 
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
-      break;
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(default_player.login_name,player.login_name,MAX_NAMELEN-1))
-      {
-	fseek(file,-(2*MAX_NAMELEN+1+2+1),SEEK_CUR);
-	break;
-      }
-  }
+  player->frame_reset_delay = 0;
 
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.login_name[i],file);
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.alias_name[i],file);
-  fputc(player.handicap,file);
-  fputc(player.setup / 256,file);
-  fputc(player.setup % 256,file);
-  fputc(player.leveldir_nr,file);
+  player->push_delay = 0;
+  player->push_delay_value = 5;
 
-  fclose(file);
-}
+  player->move_delay = 0;
+  player->last_move_dir = MV_NO_MOVING;
 
-void GetPlayerConfig()
-{
-  int old_joystick_nr = joystick_nr;
+  player->lastJX = player->lastJY = 0;
+  player->JX = player->JY = 0;
 
-  if (sound_status==SOUND_OFF)
-    player.setup &= ~SETUP_SOUND;
-  if (!sound_loops_allowed)
-  {
-    player.setup &= ~SETUP_SOUND_LOOPS;
-    player.setup &= ~SETUP_SOUND_MUSIC;
-  }
+  lastJX = lastJY = 0;
+  JX = JY = 0;
+  ZX = ZY = -1;
 
-  sound_on = SETUP_SOUND_ON(player.setup);
-  sound_loops_on = SETUP_SOUND_LOOPS_ON(player.setup);
-  sound_music_on = SETUP_SOUND_MUSIC_ON(player.setup);
-  toons_on = SETUP_TOONS_ON(player.setup);
-  direct_draw_on = SETUP_DIRECT_DRAW_ON(player.setup);
-  fading_on = SETUP_FADING_ON(player.setup);
-  autorecord_on = SETUP_RECORD_EACH_GAME_ON(player.setup);
-  joystick_nr = SETUP_2ND_JOYSTICK_ON(player.setup);
 
-  if (joystick_nr != old_joystick_nr)
+  /* test */
+  for(i=1; i<MAX_PLAYERS; i++)
   {
-    if (joystick_device)
-      close(joystick_device);
-    InitJoystick();
+    stored_player[i] = stored_player[0];
+    stored_player[i].nr = i+1;
+    stored_player[i].active = TRUE;
+    stored_player[i].local = FALSE;
   }
-}
 
-void InitGame()
-{
-  int x,y;
 
-  Dynamite = Score = 0;
-  Gems = level.edelsteine;
-  Key[0] = Key[1] = Key[2] = Key[3] = FALSE;
-  MampferNr = 0;
-  TimeLeft = level.time;
-  CheckMoving = TRUE;
-  CheckExploding = FALSE;
-  LevelSolved = GameOver = SiebAktiv = FALSE;
-  JX = JY = 0;
-  ZX = ZY = -1;
 
-  if (tape.recording)
-    TapeStartRecording();
-  else if (tape.playing)
-    TapeStartPlaying();
+  PlayerGone = LevelSolved = GameOver = SiebAktiv = FALSE;
 
-  DigField(0,0,DF_NO_PUSH);
+  DigField(0,0,0,0,DF_NO_PUSH);
   SnapField(0,0);
 
+  for(i=0;i<MAX_NUM_AMOEBA;i++)
+    AmoebaCnt[i] = AmoebaCnt2[i] = 0;
+
   for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
   {
-    Feld[x][y]=Ur[x][y];
-    MovPos[x][y]=MovDir[x][y]=MovDelay[x][y]=0;
-    Store[x][y]=Store2[x][y]=Frame[x][y]=0;
+    Feld[x][y] = Ur[x][y];
+    MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
+    Store[x][y] = Store2[x][y] = StorePlayer[x][y] = 0;
+    Frame[x][y] = 0;
+    AmoebaNr[x][y] = 0;
+    JustHit[x][y] = 0;
+
+    if (emulate_bd && !IS_BD_ELEMENT(Feld[x][y]))
+      emulate_bd = FALSE;
+    if (emulate_sb && !IS_SB_ELEMENT(Feld[x][y]))
+      emulate_sb = FALSE;
 
     switch(Feld[x][y])
     {
       case EL_SPIELFIGUR:
       case EL_SPIELER1:
+	StorePlayer[x][y] = EL_SPIELER1;
 	Feld[x][y] = EL_LEERRAUM;
-	JX = x;
-	JY = y;
+	JX = lastJX = x;
+	JY = lastJY = y;
+
+	player->JX = JX;
+	player->JY = JY;
+	player->lastJX = lastJX;
+	player->lastJY = lastJY;
+
 	break;
       case EL_SPIELER2:
+      case EL_SPIELER3:
+      case EL_SPIELER4:
+	StorePlayer[x][y] = Feld[x][y];
 	Feld[x][y] = EL_LEERRAUM;
+
+	stored_player[StorePlayer[x][y] - EL_SPIELER1].JX = x;
+	stored_player[StorePlayer[x][y] - EL_SPIELER1].JY = y;
+	stored_player[StorePlayer[x][y] - EL_SPIELER1].lastJX = x;
+	stored_player[StorePlayer[x][y] - EL_SPIELER1].lastJY = y;
+
 	break;
       case EL_BADEWANNE:
 	if (x<lev_fieldx-1 && Feld[x+1][y]==EL_SALZSAEURE)
@@ -726,20 +197,62 @@ void InitGame()
       case EL_FLIEGER_L:
       case EL_FLIEGER_U:
       case EL_FLIEGER:
+      case EL_BUTTERFLY_R:
+      case EL_BUTTERFLY_O:
+      case EL_BUTTERFLY_L:
+      case EL_BUTTERFLY_U:
+      case EL_BUTTERFLY:
+      case EL_FIREFLY_R:
+      case EL_FIREFLY_O:
+      case EL_FIREFLY_L:
+      case EL_FIREFLY_U:
+      case EL_FIREFLY:
       case EL_PACMAN_R:
       case EL_PACMAN_O:
       case EL_PACMAN_L:
       case EL_PACMAN_U:
       case EL_MAMPFER:
-      case EL_ZOMBIE:
+      case EL_MAMPFER2:
+      case EL_ROBOT:
       case EL_PACMAN:
 	InitMovDir(x,y);
 	break;
+      case EL_AMOEBE_VOLL:
+      case EL_AMOEBE_BD:
+	InitAmoebaNr(x,y);
+	break;
+      case EL_TROPFEN:
+	if (y==lev_fieldy-1)
+	{
+	  Feld[x][y] = EL_AMOEBING;
+	  Store[x][y] = EL_AMOEBE_NASS;
+	}
+	break;
+      case EL_DYNAMIT:
+	MovDelay[x][y] = 96;
+	break;
+      case EL_BIRNE_AUS:
+	local_player->lights_still_needed++;
+	break;
+      case EL_SOKOBAN_FELD_LEER:
+	local_player->sokobanfields_still_needed++;
+	break;
+      case EL_MAULWURF:
+      case EL_PINGUIN:
+	local_player->friends_still_needed++;
+	break;
+      case EL_SCHWEIN:
+      case EL_DRACHE:
+	MovDir[x][y] = 1<<RND(4);
+	break;
       default:
 	break;
     }
   }
 
+  game_emulation = (emulate_bd ? EMU_BOULDERDASH :
+		    emulate_sb ? EMU_SOKOBAN : EMU_NONE);
+
   scroll_x = scroll_y = -1;
   if (JX>=MIDPOSX-1)
     scroll_x =
@@ -748,6 +261,8 @@ void InitGame()
     scroll_y =
       (JY<=lev_fieldy-MIDPOSY ? JY-MIDPOSY : lev_fieldy-SCR_FIELDY+1);
 
+  CloseDoor(DOOR_CLOSE_1);
+
   DrawLevel();
   DrawLevelElement(JX,JY,EL_SPIELFIGUR);
   FadeToFront();
@@ -760,13 +275,13 @@ void InitGame()
 	      int2str(level_nr,2),FS_SMALL,FC_YELLOW);
   DrawTextExt(pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX1+XX_EMERALDS,DOOR_GFX_PAGEY1+YY_EMERALDS,
-	      int2str(Gems,3),FS_SMALL,FC_YELLOW);
+	      int2str(local_player->gems_still_needed,3),FS_SMALL,FC_YELLOW);
   DrawTextExt(pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX1+XX_DYNAMITE,DOOR_GFX_PAGEY1+YY_DYNAMITE,
-	      int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
+	      int2str(local_player->dynamite,3),FS_SMALL,FC_YELLOW);
   DrawTextExt(pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX1+XX_SCORE,DOOR_GFX_PAGEY1+YY_SCORE,
-	      int2str(Score,5),FS_SMALL,FC_YELLOW);
+	      int2str(local_player->score,5),FS_SMALL,FC_YELLOW);
   DrawTextExt(pix[PIX_DB_DOOR],gc,
 	      DOOR_GFX_PAGEX1+XX_TIME,DOOR_GFX_PAGEY1+YY_TIME,
 	      int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
@@ -774,9 +289,9 @@ void InitGame()
   DrawGameButton(BUTTON_GAME_STOP);
   DrawGameButton(BUTTON_GAME_PAUSE);
   DrawGameButton(BUTTON_GAME_PLAY);
-  DrawSoundDisplay(BUTTON_SOUND_MUSIC | (BUTTON_ON * sound_music_on));
-  DrawSoundDisplay(BUTTON_SOUND_LOOPS | (BUTTON_ON * sound_loops_on));
-  DrawSoundDisplay(BUTTON_SOUND_SOUND | (BUTTON_ON * sound_on));
+  DrawSoundDisplay(BUTTON_SOUND_MUSIC  | (BUTTON_ON * sound_music_on));
+  DrawSoundDisplay(BUTTON_SOUND_LOOPS  | (BUTTON_ON * sound_loops_on));
+  DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (BUTTON_ON * sound_simple_on));
   XCopyArea(display,drawto,pix[PIX_DB_DOOR],gc,
 	    DX+GAME_CONTROL_XPOS,DY+GAME_CONTROL_YPOS,
 	    GAME_CONTROL_XSIZE,2*GAME_CONTROL_YSIZE,
@@ -796,15 +311,15 @@ void InitMovDir(int x, int y)
   int i, element = Feld[x][y];
   static int xy[4][2] =
   {
-    0,+1,
-    +1,0,
-    0,-1,
-    -1,0
+    { 0,+1 },
+    { +1,0 },
+    { 0,-1 },
+    { -1,0 }
   };
   static int direction[2][4] =
   {
-    MV_RIGHT, MV_UP,   MV_LEFT,  MV_DOWN,
-    MV_LEFT,  MV_DOWN, MV_RIGHT, MV_UP
+    { MV_RIGHT, MV_UP,   MV_LEFT,  MV_DOWN },
+    { MV_LEFT,  MV_DOWN, MV_RIGHT, MV_UP }
   };
 
   switch(element)
@@ -823,6 +338,20 @@ void InitMovDir(int x, int y)
       Feld[x][y] = EL_FLIEGER;
       MovDir[x][y] = direction[0][element-EL_FLIEGER_R];
       break;
+    case EL_BUTTERFLY_R:
+    case EL_BUTTERFLY_O:
+    case EL_BUTTERFLY_L:
+    case EL_BUTTERFLY_U:
+      Feld[x][y] = EL_BUTTERFLY;
+      MovDir[x][y] = direction[0][element-EL_BUTTERFLY_R];
+      break;
+    case EL_FIREFLY_R:
+    case EL_FIREFLY_O:
+    case EL_FIREFLY_L:
+    case EL_FIREFLY_U:
+      Feld[x][y] = EL_FIREFLY;
+      MovDir[x][y] = direction[0][element-EL_FIREFLY_R];
+      break;
     case EL_PACMAN_R:
     case EL_PACMAN_O:
     case EL_PACMAN_L:
@@ -832,7 +361,10 @@ void InitMovDir(int x, int y)
       break;
     default:
       MovDir[x][y] = 1<<RND(4);
-      if (element!=EL_KAEFER && element!=EL_FLIEGER)
+      if (element != EL_KAEFER &&
+	  element != EL_FLIEGER &&
+	  element != EL_BUTTERFLY &&
+	  element != EL_FIREFLY)
 	break;
 
       for(i=0;i<4;i++)
@@ -844,12 +376,12 @@ void InitMovDir(int x, int y)
 
 	if (!IN_LEV_FIELD(x1,y1) || !IS_FREE(x1,y1))
 	{
-	  if (element==EL_KAEFER)
+	  if (element==EL_KAEFER || element==EL_BUTTERFLY)
 	  {
 	    MovDir[x][y] = direction[0][i];
 	    break;
 	  }
-	  else if (element==EL_FLIEGER)
+	  else if (element==EL_FLIEGER || element==EL_FIREFLY)
 	  {
 	    MovDir[x][y] = direction[1][i];
 	    break;
@@ -860,46 +392,85 @@ void InitMovDir(int x, int y)
   }
 }
 
+void InitAmoebaNr(int x, int y)
+{
+  int i;
+  int group_nr = AmoebeNachbarNr(x,y);
+
+  if (group_nr==0)
+  {
+    for(i=1;i<MAX_NUM_AMOEBA;i++)
+    {
+      if (AmoebaCnt[i]==0)
+      {
+	group_nr = i;
+	break;
+      }
+    }
+  }
+
+  AmoebaNr[x][y] = group_nr;
+  AmoebaCnt[group_nr]++;
+  AmoebaCnt2[group_nr]++;
+}
+
 void GameWon()
 {
   int hi_pos;
   int bumplevel = FALSE;
 
-  if (sound_loops_on)
-    PlaySoundExt(SND_SIRR,PSND_MAX_VOLUME,PSND_MAX_RIGHT,PSND_LOOP);
+  LevelSolved = FALSE;
 
-  if (TimeLeft>0) 
+  if (TimeLeft)
   {
-    for(;TimeLeft>=0;TimeLeft--)
+    if (sound_loops_on)
+      PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
+
+    while(TimeLeft > 0)
     {
       if (!sound_loops_on)
-	PlaySoundStereo(SND_SIRR,PSND_MAX_RIGHT);
+	PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
       if (TimeLeft && !(TimeLeft % 10))
 	RaiseScore(level.score[SC_ZEITBONUS]);
-      DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
+      if (TimeLeft > 100 && !(TimeLeft % 10))
+	TimeLeft -= 10;
+      else
+	TimeLeft--;
+      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft,3), FS_SMALL, FC_YELLOW);
       BackToFront();
-      Delay(10000);
+      Delay(10);
     }
+
+    if (sound_loops_on)
+      StopSound(SND_SIRR);
   }
 
-  if (sound_loops_on)
-    StopSound(SND_SIRR);
   FadeSounds();
 
+  /* Hero disappears */
+  DrawLevelField(ExitX, ExitY);
+  BackToFront();
+
   if (tape.playing)
     return;
 
   CloseDoor(DOOR_CLOSE_1);
 
-  if (level_nr==player.handicap &&
-      level_nr<leveldir[leveldir_nr].num_ready) 
+  if (tape.recording)
+  {
+    TapeStop();
+    SaveLevelTape(tape.level_nr);	/* Ask to save tape */
+  }
+
+  if (level_nr == local_player->handicap &&
+      level_nr < leveldir[leveldir_nr].levels-1)
   { 
-    player.handicap++; 
+    local_player->handicap++; 
     bumplevel = TRUE;
     SavePlayerInfo(PLAYER_LEVEL);
   }
 
-  if ((hi_pos=NewHiScore())>=0) 
+  if ((hi_pos=NewHiScore()) >= 0) 
   {
     game_status = HALLOFFAME;
     DrawHallOfFame(hi_pos);
@@ -913,6 +484,7 @@ void GameWon()
       level_nr++;
     DrawMainMenu();
   }
+
   BackToFront();
 }
 
@@ -923,21 +495,23 @@ BOOL NewHiScore()
 
   LoadScore(level_nr);
 
-  if (!strcmp(player.alias_name,EMPTY_ALIAS) ||
-      Score<highscore[MAX_SCORE_ENTRIES-1].Score) 
+  if (!strcmp(local_player->alias_name,EMPTY_ALIAS) ||
+      local_player->score < highscore[MAX_SCORE_ENTRIES-1].Score) 
     return(-1);
 
   for(k=0;k<MAX_SCORE_ENTRIES;k++) 
   {
-    if (Score>highscore[k].Score)	/* Spieler kommt in Highscore-Liste */
+    if (local_player->score > highscore[k].Score)
     {
+      /* Spieler kommt in Highscore-Liste */
+
       if (k<MAX_SCORE_ENTRIES-1)
       {
 	int m = MAX_SCORE_ENTRIES-1;
 
 #ifdef ONE_PER_NAME
 	for(l=k;l<MAX_SCORE_ENTRIES;l++)
-	  if (!strcmp(player.alias_name,highscore[l].Name))
+	  if (!strcmp(local_player->alias_name,highscore[l].Name))
 	    m = l;
 	if (m==k)	/* Spieler überschreibt seine alte Position */
 	  goto put_into_list;
@@ -953,18 +527,19 @@ BOOL NewHiScore()
 #ifdef ONE_PER_NAME
       put_into_list:
 #endif
-      sprintf(highscore[k].Name,player.alias_name);
-      highscore[k].Score = Score; 
+      sprintf(highscore[k].Name,local_player->alias_name);
+      highscore[k].Score = local_player->score; 
       position = k;
       break;
     }
-  }
 
 #ifdef ONE_PER_NAME
-  else if (!strcmp(player.alias_name,highscore[k].Name))
-    break;	/* Spieler schon mit besserer Punktzahl in der Liste */
+    else if (!strcmp(local_player->alias_name,highscore[k].Name))
+      break;	/* Spieler schon mit besserer Punktzahl in der Liste */
 #endif
 
+  }
+
   if (position>=0) 
     SaveScore(level_nr);
 
@@ -976,10 +551,9 @@ void InitMovingField(int x, int y, int direction)
   int newx = x + (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0);
   int newy = y + (direction==MV_UP   ? -1 : direction==MV_DOWN  ? +1 : 0);
 
-  CheckMoving = TRUE;
   MovDir[x][y] = direction;
   MovDir[newx][newy] = direction;
-  if (Feld[newx][newy]==EL_LEERRAUM)
+  if (Feld[newx][newy] == EL_LEERRAUM)
     Feld[newx][newy] = EL_BLOCKED;
 }
 
@@ -1028,15 +602,15 @@ int MovingOrBlocked2Element(int x, int y)
 
 void RemoveMovingField(int x, int y)
 {
-  int oldx=x,oldy=y, newx=x,newy=y;
+  int oldx = x,oldy = y, newx = x,newy = y;
 
-  if (Feld[x][y]!=EL_BLOCKED && !IS_MOVING(x,y))
+  if (Feld[x][y] != EL_BLOCKED && !IS_MOVING(x,y))
     return;
 
   if (IS_MOVING(x,y))
   {
     Moving2Blocked(x,y,&newx,&newy);
-    if (Feld[newx][newy]!=EL_BLOCKED)
+    if (Feld[newx][newy] != EL_BLOCKED)
       return;
   }
   else if (Feld[x][y]==EL_BLOCKED)
@@ -1046,53 +620,69 @@ void RemoveMovingField(int x, int y)
       return;
   }
 
-  Feld[oldx][oldy] = EL_LEERRAUM;
+  if (Feld[x][y]==EL_BLOCKED &&
+      (Store[oldx][oldy]==EL_MORAST_LEER ||
+       Store[oldx][oldy]==EL_SIEB_LEER ||
+       Store[oldx][oldy]==EL_SIEB2_LEER ||
+       Store[oldx][oldy]==EL_AMOEBE_NASS))
+  {
+    Feld[oldx][oldy] = Store[oldx][oldy];
+    Store[oldx][oldy] = Store2[oldx][oldy] = 0;
+  }
+  else
+    Feld[oldx][oldy] = EL_LEERRAUM;
+
   Feld[newx][newy] = EL_LEERRAUM;
   MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0;
   MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0;
+
   DrawLevelField(oldx,oldy);
   DrawLevelField(newx,newy);
 }
 
 void DrawDynamite(int x, int y)
 {
-  int phase = (48-MovDelay[x][y])/6;
+  int sx = SCROLLX(x), sy = SCROLLY(y);
+  int graphic = el2gfx(Feld[x][y]);
+  int phase;
 
-  if (!IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+  if (!IN_SCR_FIELD(sx,sy) || IS_PLAYER(x,y))
     return;
 
-  if (phase>6)
-    phase = 6;
-
   if (Store[x][y])
+    DrawGraphic(sx,sy, el2gfx(Store[x][y]));
+
+  if (Feld[x][y]==EL_DYNAMIT)
+  {
+    if ((phase = (96-MovDelay[x][y])/12) > 6)
+      phase = 6;
+  }
+  else
   {
-    DrawGraphic(SCROLLX(x),SCROLLY(y),el2gfx(Store[x][y]));
-    if (PLAYER(x,y))
-      DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_SPIELFIGUR);
+    if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3)
+      phase = 7-phase;
   }
-  else if (PLAYER(x,y))
-    DrawGraphic(SCROLLX(JX),SCROLLY(JY),GFX_SPIELFIGUR);
 
-  if (Store[x][y] || PLAYER(x,y))
-    DrawGraphicThruMask(SCROLLX(x),SCROLLY(y),GFX_DYNAMIT+phase);
+  if (Store[x][y])
+    DrawGraphicThruMask(sx,sy, graphic + phase);
   else
-    DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_DYNAMIT+phase);
+    DrawGraphic(sx,sy, graphic + phase);
 }
 
 void CheckDynamite(int x, int y)
 {
-  CheckExploding=TRUE;
-
   if (MovDelay[x][y])		/* neues Dynamit / in Wartezustand */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y])
     {
-      if (!(MovDelay[x][y] % 6))
-      {
-	DrawDynamite(x,y);
+      if (!(MovDelay[x][y] % 12))
 	PlaySoundLevel(x,y,SND_ZISCH);
-      }
+
+      if (Feld[x][y]==EL_DYNAMIT && !(MovDelay[x][y] % 12))
+	DrawDynamite(x,y);
+      else if (Feld[x][y]==EL_DYNABOMB && !(MovDelay[x][y] % 6))
+	DrawDynamite(x,y);
 
       return;
     }
@@ -1102,10 +692,10 @@ void CheckDynamite(int x, int y)
   Bang(x,y);
 }
 
-void Explode(int ex, int ey, int phase)
+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;
 
@@ -1113,36 +703,76 @@ void Explode(int ex, int ey, int phase)
   {
     int center_element = Feld[ex][ey];
 
-    if (center_element==EL_BLOCKED)
+    if (IS_MOVING(ex,ey) || IS_BLOCKED(ex,ey))
+    {
       center_element = MovingOrBlocked2Element(ex,ey);
+      RemoveMovingField(ex,ey);
+    }
 
     for(y=ey-1;y<ey+2;y++) for(x=ex-1;x<ex+2;x++)
     {
       int element = Feld[x][y];
 
-      if (!IN_LEV_FIELD(x,y) || IS_MASSIV(element))
+      if (IS_MOVING(x,y) || IS_BLOCKED(x,y))
+      {
+	element = MovingOrBlocked2Element(x,y);
+	RemoveMovingField(x,y);
+      }
+
+      if (!IN_LEV_FIELD(x,y) || IS_MASSIV(element) || element==EL_BURNING)
+	continue;
+
+      if ((mode!=EX_NORMAL || center_element==EL_AMOEBA2DIAM) &&
+	  (x!=ex || y!=ey))
 	continue;
 
       if (element==EL_EXPLODING)
 	element = Store2[x][y];
 
-      if (PLAYER(ex,ey) || center_element==EL_KAEFER)
+      if (IS_PLAYER(ex,ey))
+	Store[x][y] = EL_EDELSTEIN_GELB;
+      else if (center_element==EL_MAULWURF)
+	Store[x][y] = EL_EDELSTEIN_ROT;
+      else if (center_element==EL_PINGUIN)
+	Store[x][y] = EL_EDELSTEIN_LILA;
+      else if (center_element==EL_KAEFER)
 	Store[x][y] = ((x==ex && y==ey) ? EL_DIAMANT : EL_EDELSTEIN);
+      else if (center_element==EL_BUTTERFLY)
+	Store[x][y] = EL_EDELSTEIN_BD;
       else if (center_element==EL_MAMPFER)
 	Store[x][y] = level.mampfer_inhalt[MampferNr][x-ex+1][y-ey+1];
-      else if (Feld[x][y]==EL_ERZ_1)
+      else if (center_element==EL_AMOEBA2DIAM)
+	Store[x][y] = level.amoebe_inhalt;
+      else if (element==EL_ERZ_EDEL)
 	Store[x][y] = EL_EDELSTEIN;
-      else if (Feld[x][y]==EL_ERZ_2)
+      else if (element==EL_ERZ_DIAM)
 	Store[x][y] = EL_DIAMANT;
+      else if (element==EL_ERZ_EDEL_BD)
+	Store[x][y] = EL_EDELSTEIN_BD;
+      else if (element==EL_ERZ_EDEL_GELB)
+	Store[x][y] = EL_EDELSTEIN_GELB;
+      else if (element==EL_ERZ_EDEL_ROT)
+	Store[x][y] = EL_EDELSTEIN_ROT;
+      else if (element==EL_ERZ_EDEL_LILA)
+	Store[x][y] = EL_EDELSTEIN_LILA;
       else if (!IS_PFORTE(Store[x][y]))
 	Store[x][y] = EL_LEERRAUM;
 
-      if (x!=ex || y!=ey)
+      if (x!=ex || y!=ey || center_element==EL_AMOEBA2DIAM || mode==EX_BORDER)
 	Store2[x][y] = element;
 
-      RemoveMovingField(x,y);
+      if (AmoebaNr[x][y] &&
+	  (element==EL_AMOEBE_VOLL ||
+	   element==EL_AMOEBE_BD ||
+	   element==EL_AMOEBING))
+      {
+	AmoebaCnt[AmoebaNr[x][y]]--;
+	AmoebaCnt2[AmoebaNr[x][y]]--;
+      }
+
       Feld[x][y] = EL_EXPLODING;
       MovDir[x][y] = MovPos[x][y] = 0;
+      AmoebaNr[x][y] = 0;
       Frame[x][y] = 1;
       Stop[x][y] = TRUE;
     }
@@ -1165,17 +795,16 @@ void Explode(int ex, int ey, int phase)
   {
     int element = Store2[x][y];
 
-    if (PLAYER(x,y))
+    if (IS_PLAYER(x,y))
       KillHero();
-    else if (element==EL_BOMBE ||
-	     element==EL_DYNAMIT ||
-	     element==EL_DYNAMIT_AUS ||
-	     element==EL_KAEFER)
+    else if (IS_EXPLOSIVE(element))
     {
       Feld[x][y] = Store2[x][y];
       Store2[x][y] = 0;
       Bang(x,y);
     }
+    else if (element==EL_AMOEBA2DIAM)
+      AmoebeUmwandeln(x,y);
   }
 
   if (phase==last_phase)
@@ -1196,39 +825,79 @@ void Explode(int ex, int ey, int phase)
 
     DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_EXPLOSION+(phase/delay-1));
   }
+}
+
+void DynaExplode(int ex, int ey, int size)
+{
+  int i,j;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
 
-  CheckExploding=TRUE;
+  Explode(ex,ey,0,EX_CENTER);
+
+  for(i=0;i<4;i++)
+  {
+    for(j=1;j<=size;j++)
+    {
+      int x = ex+j*xy[i%4][0];
+      int y = ey+j*xy[i%4][1];
+      int element;
+
+      if (!IN_LEV_FIELD(x,y) || IS_MASSIV(Feld[x][y]))
+	break;
+
+      element = Feld[x][y];
+      Explode(x,y,0,EX_BORDER);
+
+      if (element != EL_LEERRAUM &&
+	  element != EL_ERDREICH &&
+	  element != EL_EXPLODING &&
+	  !player->dynabomb_xl)
+	break;
+    }
+  }
+
+  player->dynabombs_left++;
 }
 
 void Bang(int x, int y)
 {
   int element = Feld[x][y];
 
-  CheckExploding=TRUE;
   PlaySoundLevel(x,y,SND_ROAAAR);
 
   switch(element)
   {
     case EL_KAEFER:
-      RaiseScore(level.score[SC_KAEFER]);
-      break;
     case EL_FLIEGER:
-      RaiseScore(level.score[SC_FLIEGER]);
-      break;
+    case EL_BUTTERFLY:
+    case EL_FIREFLY:
     case EL_MAMPFER:
-      RaiseScore(level.score[SC_MAMPFER]);
+    case EL_MAMPFER2:
+    case EL_ROBOT:
+    case EL_PACMAN:
+      RaiseScoreElement(element);
+      Explode(x,y,0,EX_NORMAL);
       break;
-    case EL_ZOMBIE:
-      RaiseScore(level.score[SC_ZOMBIE]);
+    case EL_DYNABOMB:
+    case EL_DYNABOMB_NR:
+    case EL_DYNABOMB_SZ:
+    case EL_DYNABOMB_XL:
+      DynaExplode(x,y,player->dynabomb_size);
       break;
-    case EL_PACMAN:
-      RaiseScore(level.score[SC_PACMAN]);
+    case EL_BIRNE_AUS:
+    case EL_BIRNE_EIN:
+      Explode(x,y,0,EX_CENTER);
       break;
     default:
+      Explode(x,y,0,EX_NORMAL);
       break;
   }
-
-  Explode(x,y,0);
 }
 
 void Blurb(int x, int y)
@@ -1255,16 +924,14 @@ void Blurb(int x, int y)
   {
     int graphic = (element==EL_BLURB_LEFT ? GFX_BLURB_LEFT : GFX_BLURB_RIGHT);
 
-    CheckExploding=TRUE;
-
     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]);
+      if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+	DrawGraphic(SCROLLX(x),SCROLLY(y),graphic+4-MovDelay[x][y]/2);
 
       if (!MovDelay[x][y])
       {
@@ -1280,15 +947,20 @@ void Impact(int x, int y)
   BOOL lastline = (y==lev_fieldy-1);
   BOOL object_hit = FALSE;
   int element = Feld[x][y];
+  int smashed = 0;
 
   /* Element darunter berührt? */
   if (!lastline)
+  {
     object_hit = (!IS_FREE(x,y+1) && (!IS_MOVING(x,y+1) ||
 				      MovDir[x][y+1]!=MV_DOWN ||
 				      MovPos[x][y+1]<=TILEY/2));
+    if (object_hit)
+      smashed = MovingOrBlocked2Element(x,y+1);
+  }
 
   /* Auftreffendes Element fällt in Salzsäure */
-  if (!lastline && Feld[x][y+1]==EL_SALZSAEURE)
+  if (!lastline && smashed==EL_SALZSAEURE)
   {
     Blurb(x,y);
     return;
@@ -1304,33 +976,54 @@ void Impact(int x, int y)
   /* Auftreffendes Element ist Säuretropfen */
   if (element==EL_TROPFEN && (lastline || object_hit))
   {
-    if (object_hit && PLAYER(x,y+1))
+    if (object_hit && IS_PLAYER(x,y+1))
       KillHero();
+    else if (object_hit && (smashed==EL_MAULWURF || smashed==EL_PINGUIN))
+      Bang(x,y+1);
     else
-      Feld[x][y] = EL_AMOEBING2;
+    {
+      Feld[x][y] = EL_AMOEBING;
+      Store[x][y] = EL_AMOEBE_NASS;
+    }
     return;
   }
 
   /* Welches Element kriegt was auf die Rübe? */
   if (!lastline && object_hit)
   {
-    int smashed = Feld[x][y+1];
+    if (CAN_CHANGE(element) && 
+	(smashed==EL_SIEB_LEER || smashed==EL_SIEB2_LEER) && !SiebAktiv)
+      SiebAktiv = level.dauer_sieb * FRAMES_PER_SECOND;
 
-    if (PLAYER(x,y+1))
+    if (IS_PLAYER(x,y+1))
     {
       KillHero();
       return;
     }
+    else if (smashed==EL_MAULWURF || smashed==EL_PINGUIN)
+    {
+      Bang(x,y+1);
+      return;
+    }
+    else if (element==EL_EDELSTEIN_BD)
+    {
+      if (IS_ENEMY(smashed) && IS_BD_ELEMENT(smashed))
+      {
+	Bang(x,y+1);
+	return;
+      }
+    }
     else if (element==EL_FELSBROCKEN)
     {
-      if (IS_ENEMY(MovingOrBlocked2Element(x,y+1)))
+      if (IS_ENEMY(smashed) || smashed==EL_BOMBE || smashed==EL_SONDE ||
+	  smashed==EL_SCHWEIN || smashed==EL_DRACHE)
       {
 	Bang(x,y+1);
 	return;
       }
       else if (!IS_MOVING(x,y+1))
       {
-	if (smashed==EL_BOMBE)
+	if (smashed==EL_BIRNE_AUS || smashed==EL_BIRNE_EIN)
 	{
 	  Bang(x,y+1);
 	  return;
@@ -1339,7 +1032,7 @@ void Impact(int x, int y)
 	{
 	  Feld[x][y+1] = EL_CRACKINGNUT;
 	  PlaySoundLevel(x,y,SND_KNACK);
-	  RaiseScore(level.score[SC_KOKOSNUSS]);
+	  RaiseScoreElement(EL_KOKOSNUSS);
 	  return;
 	}
 	else if (smashed==EL_DIAMANT)
@@ -1352,9 +1045,12 @@ void Impact(int x, int y)
     }
   }
 
-  /* Kein Geräusch beim Durchqueren des Siebes */
-  if (!lastline && Feld[x][y+1]==EL_SIEB_LEER)
+  /* Geräusch beim Durchqueren des Siebes */
+  if (!lastline && (Feld[x][y+1]==EL_SIEB_LEER || Feld[x][y+1]==EL_SIEB2_LEER))
+  {
+    PlaySoundLevel(x,y,SND_QUIRK);
     return;
+  }
 
   /* Geräusch beim Auftreffen */
   if (lastline || object_hit)
@@ -1364,6 +1060,10 @@ void Impact(int x, int y)
     switch(element)
     {
       case EL_EDELSTEIN:
+      case EL_EDELSTEIN_BD:
+      case EL_EDELSTEIN_GELB:
+      case EL_EDELSTEIN_ROT:
+      case EL_EDELSTEIN_LILA:
       case EL_DIAMANT:
         sound = SND_PLING;
 	break;
@@ -1380,6 +1080,10 @@ void Impact(int x, int y)
       case EL_SCHLUESSEL4:
 	sound = SND_KINK;
 	break;
+      case EL_ZEIT_VOLL:
+      case EL_ZEIT_LEER:
+	sound = SND_DENG;
+	break;
       default:
 	sound = -1;
         break;
@@ -1392,162 +1096,354 @@ void Impact(int x, int y)
 
 void TurnRound(int x, int y)
 {
+  static struct
+  {
+    int x,y;
+  } move_xy[] =
+  {
+    { 0,0 },
+    {-1,0 },
+    {+1,0 },
+    { 0,0 },
+    { 0,-1 },
+    { 0,0 }, { 0,0 }, { 0,0 },
+    { 0,+1 }
+  };
+  static struct
+  {
+    int left,right,back;
+  } turn[] =
+  {
+    { 0,	0,		0 },
+    { MV_DOWN,	MV_UP,		MV_RIGHT },
+    { MV_UP,	MV_DOWN,	MV_LEFT },
+    { 0,	0,		0 },
+    { MV_LEFT,	MV_RIGHT,	MV_DOWN },
+    { 0,0,0 },	{ 0,0,0 },	{ 0,0,0 },
+    { MV_RIGHT,	MV_LEFT,	MV_UP }
+  };
+
   int element = Feld[x][y];
-  int direction = MovDir[x][y];
+  int old_move_dir = MovDir[x][y];
+  int left_dir = turn[old_move_dir].left;
+  int right_dir = turn[old_move_dir].right;
+  int back_dir = turn[old_move_dir].back;
+
+  int left_dx = move_xy[left_dir].x, left_dy = move_xy[left_dir].y;
+  int right_dx = move_xy[right_dir].x, right_dy = move_xy[right_dir].y;
+  int move_dx = move_xy[old_move_dir].x, move_dy = move_xy[old_move_dir].y;
+  int back_dx = move_xy[back_dir].x, back_dy = move_xy[back_dir].y;
+
+  int left_x = x+left_dx, left_y = y+left_dy;
+  int right_x = x+right_dx, right_y = y+right_dy;
+  int move_x = x+move_dx, move_y = y+move_dy;
 
-  if (element==EL_KAEFER)
+  if (element==EL_KAEFER || element==EL_BUTTERFLY)
   {
     TestIfBadThingHitsOtherBadThing(x,y);
 
-    if (MovDir[x][y]==MV_LEFT)
-    {
-      if (IN_LEV_FIELD(x,y-1) && IS_FREE(x,y-1))
-	MovDir[x][y]=MV_UP;
-      else if (!IN_LEV_FIELD(x-1,y) || !IS_FREE(x-1,y))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_RIGHT)
-    {
-      if (IN_LEV_FIELD(x,y+1) && IS_FREE(x,y+1))
-	MovDir[x][y]=MV_DOWN;
-      else if (!IN_LEV_FIELD(x+1,y) || !IS_FREE(x+1,y))
-	MovDir[x][y]=MV_UP;
-    }
-    else if (MovDir[x][y]==MV_UP)
-    {
-      if (IN_LEV_FIELD(x+1,y) && IS_FREE(x+1,y))
-	MovDir[x][y]=MV_RIGHT;
-      else if (!IN_LEV_FIELD(x,y-1) || !IS_FREE(x,y-1))
-	MovDir[x][y]=MV_LEFT;
-    }
-    else if (MovDir[x][y]==MV_DOWN)
-    {
-      if (IN_LEV_FIELD(x-1,y) && IS_FREE(x-1,y))
-	MovDir[x][y]=MV_LEFT;
-      else if (!IN_LEV_FIELD(x,y+1) || !IS_FREE(x,y+1))
-	MovDir[x][y]=MV_RIGHT;
-    }
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	IS_FREE_OR_PLAYER(right_x,right_y))
+      MovDir[x][y] = right_dir;
+    else if (!IN_LEV_FIELD(move_x,move_y) ||
+	     !IS_FREE_OR_PLAYER(move_x,move_y))
+      MovDir[x][y] = left_dir;
 
-    if (direction!=MovDir[x][y])
-      MovDelay[x][y]=5;
+    if (element==EL_KAEFER && MovDir[x][y] != old_move_dir)
+      MovDelay[x][y] = 9;
+    else if (element==EL_BUTTERFLY)	/* && MovDir[x][y]==left_dir) */
+      MovDelay[x][y] = 1;
   }
-  else if (element==EL_FLIEGER)
+  else if (element==EL_FLIEGER || element==EL_FIREFLY)
   {
     TestIfBadThingHitsOtherBadThing(x,y);
 
-    if (MovDir[x][y]==MV_LEFT)
-    {
-      if (IN_LEV_FIELD(x,y+1) && IS_FREE(x,y+1))
-	MovDir[x][y]=MV_DOWN;
-      else if (!IN_LEV_FIELD(x-1,y) || !IS_FREE(x-1,y))
-	MovDir[x][y]=MV_UP;
-    }
-    else if (MovDir[x][y]==MV_RIGHT)
-    {
-      if (IN_LEV_FIELD(x,y-1) && IS_FREE(x,y-1))
-	MovDir[x][y]=MV_UP;
-      else if (!IN_LEV_FIELD(x+1,y) || !IS_FREE(x+1,y))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_UP)
-    {
-      if (IN_LEV_FIELD(x-1,y) && IS_FREE(x-1,y))
-	MovDir[x][y]=MV_LEFT;
-      else if (!IN_LEV_FIELD(x,y-1) || !IS_FREE(x,y-1))
-	MovDir[x][y]=MV_RIGHT;
-    }
-    else if (MovDir[x][y]==MV_DOWN)
-    {
-      if (IN_LEV_FIELD(x+1,y) && IS_FREE(x+1,y))
-	MovDir[x][y]=MV_RIGHT;
-      else if (!IN_LEV_FIELD(x,y+1) || !IS_FREE(x,y+1))
-	MovDir[x][y]=MV_LEFT;
-    }
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	IS_FREE_OR_PLAYER(left_x,left_y))
+      MovDir[x][y] = left_dir;
+    else if (!IN_LEV_FIELD(move_x,move_y) ||
+	     !IS_FREE_OR_PLAYER(move_x,move_y))
+      MovDir[x][y] = right_dir;
+
+    if (element==EL_FLIEGER && MovDir[x][y] != old_move_dir)
+      MovDelay[x][y] = 9;
+    else if (element==EL_FIREFLY)	/* && MovDir[x][y]==right_dir) */
+      MovDelay[x][y] = 1;
+  }
+  else if (element==EL_MAMPFER)
+  {
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE;
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE_OR_PLAYER(left_x,left_y) ||
+	 Feld[left_x][left_y] == EL_DIAMANT))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE_OR_PLAYER(right_x,right_y) ||
+	 Feld[right_x][right_y] == EL_DIAMANT))
+      can_turn_right = TRUE;
+
+    if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+    else if (can_turn_left)
+      MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+    else if (can_turn_right)
+      MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+    else
+      MovDir[x][y] = back_dir;
 
-    if (direction!=MovDir[x][y])
-      MovDelay[x][y]=5;
+    MovDelay[x][y] = 16+16*RND(3);
   }
-  else if (element==EL_MAMPFER)
+  else if (element==EL_MAMPFER2)
   {
-    if (MovDir[x][y]==MV_LEFT || MovDir[x][y]==MV_RIGHT)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_LEFT ? MV_RIGHT : MV_LEFT);
-      if (IN_LEV_FIELD(x,y-1) &&
-	  (IS_FREE(x,y-1) || Feld[x][y-1]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_UP;
-      if (IN_LEV_FIELD(x,y+1) &&
-	  (IS_FREE(x,y+1) || Feld[x][y+1]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_UP || MovDir[x][y]==MV_DOWN)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_UP ? MV_DOWN : MV_UP);
-      if (IN_LEV_FIELD(x-1,y) &&
-	  (IS_FREE(x-1,y) || Feld[x-1][y]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_LEFT;
-      if (IN_LEV_FIELD(x+1,y) &&
-	  (IS_FREE(x+1,y) || Feld[x+1][y]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_RIGHT;
-    }
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE;
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE_OR_PLAYER(left_x,left_y) ||
+	 IS_MAMPF2(Feld[left_x][left_y])))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE_OR_PLAYER(right_x,right_y) ||
+	 IS_MAMPF2(Feld[right_x][right_y])))
+      can_turn_right = TRUE;
+
+    if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+    else if (can_turn_left)
+      MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+    else if (can_turn_right)
+      MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+    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)
   {
-    if (MovDir[x][y]==MV_LEFT || MovDir[x][y]==MV_RIGHT)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_LEFT ? MV_RIGHT : MV_LEFT);
-      if (IN_LEV_FIELD(x,y-1) &&
-	  (IS_FREE(x,y-1) || IS_AMOEBOID(Feld[x][y-1])) &&
-	  RND(2))
-	MovDir[x][y]=MV_UP;
-      if (IN_LEV_FIELD(x,y+1) &&
-	  (IS_FREE(x,y+1) || IS_AMOEBOID(Feld[x][y+1])) &&
-	  RND(2))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_UP || MovDir[x][y]==MV_DOWN)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_UP ? MV_DOWN : MV_UP);
-      if (IN_LEV_FIELD(x-1,y) &&
-	  (IS_FREE(x-1,y) || IS_AMOEBOID(Feld[x-1][y])) &&
-	  RND(2))
-	MovDir[x][y]=MV_LEFT;
-      if (IN_LEV_FIELD(x+1,y) &&
-	  (IS_FREE(x+1,y) || IS_AMOEBOID(Feld[x+1][y])) &&
-	  RND(2))
-	MovDir[x][y]=MV_RIGHT;
-    }
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE;
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE_OR_PLAYER(left_x,left_y) ||
+	 IS_AMOEBOID(Feld[left_x][left_y])))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE_OR_PLAYER(right_x,right_y) ||
+	 IS_AMOEBOID(Feld[right_x][right_y])))
+      can_turn_right = TRUE;
+
+    if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+    else if (can_turn_left)
+      MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+    else if (can_turn_right)
+      MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+    else
+      MovDir[x][y] = back_dir;
+
+    MovDelay[x][y] = 6+RND(40);
+  }
+  else if (element==EL_SCHWEIN)
+  {
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
+    BOOL should_turn_left = FALSE, should_turn_right = FALSE;
+    BOOL should_move_on = FALSE;
+    int rnd_value = 24;
+    int rnd = RND(rnd_value);
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE(left_x,left_y) || IS_GEM(Feld[left_x][left_y])))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE(right_x,right_y) || IS_GEM(Feld[right_x][right_y])))
+      can_turn_right = TRUE;
+    if (IN_LEV_FIELD(move_x,move_y) &&
+	(IS_FREE(move_x,move_y) || IS_GEM(Feld[move_x][move_y])))
+      can_move_on = TRUE;
+
+    if (can_turn_left &&
+	(!can_move_on ||
+	 (IN_LEV_FIELD(x+back_dx+left_dx,y+back_dy+left_dy) &&
+	  !IS_FREE(x+back_dx+left_dx,y+back_dy+left_dy))))
+      should_turn_left = TRUE;
+    if (can_turn_right &&
+	(!can_move_on ||
+	 (IN_LEV_FIELD(x+back_dx+right_dx,y+back_dy+right_dy) &&
+	  !IS_FREE(x+back_dx+right_dx,y+back_dy+right_dy))))
+      should_turn_right = TRUE;
+    if (can_move_on &&
+	(!can_turn_left || !can_turn_right ||
+	 (IN_LEV_FIELD(x+move_dx+left_dx,y+move_dy+left_dy) &&
+	  !IS_FREE(x+move_dx+left_dx,y+move_dy+left_dy)) ||
+	 (IN_LEV_FIELD(x+move_dx+right_dx,y+move_dy+right_dy) &&
+	  !IS_FREE(x+move_dx+right_dx,y+move_dy+right_dy))))
+      should_move_on = TRUE;
+
+    if (should_turn_left || should_turn_right || should_move_on)
+    {
+      if (should_turn_left && should_turn_right && should_move_on)
+	MovDir[x][y] = (rnd < rnd_value/3 ? left_dir :
+			rnd < 2*rnd_value/3 ? right_dir :
+			old_move_dir);
+      else if (should_turn_left && should_turn_right)
+	MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir);
+      else if (should_turn_left && should_move_on)
+	MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : old_move_dir);
+      else if (should_turn_right && should_move_on)
+	MovDir[x][y] = (rnd < rnd_value/2 ? right_dir : old_move_dir);
+      else if (should_turn_left)
+	MovDir[x][y] = left_dir;
+      else if (should_turn_right)
+	MovDir[x][y] = right_dir;
+      else if (should_move_on)
+	MovDir[x][y] = old_move_dir;
+    }
+    else if (can_move_on && rnd > rnd_value/8)
+      MovDir[x][y] = old_move_dir;
+    else if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir);
+    else if (can_turn_left && rnd > rnd_value/8)
+      MovDir[x][y] = left_dir;
+    else if (can_turn_right && rnd > rnd_value/8)
+      MovDir[x][y] = right_dir;
+    else
+      MovDir[x][y] = back_dir;
+
+    if (!IS_FREE(x+move_xy[MovDir[x][y]].x,y+move_xy[MovDir[x][y]].y) &&
+	!IS_GEM(Feld[x+move_xy[MovDir[x][y]].x][y+move_xy[MovDir[x][y]].y]))
+      MovDir[x][y] = old_move_dir;
+
+    MovDelay[x][y] = 0;
+  }
+  else if (element==EL_DRACHE)
+  {
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
+    int rnd_value = 24;
+    int rnd = RND(rnd_value);
+
+    if (IN_LEV_FIELD(left_x,left_y) && IS_FREE(left_x,left_y))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) && IS_FREE(right_x,right_y))
+      can_turn_right = TRUE;
+    if (IN_LEV_FIELD(move_x,move_y) && IS_FREE(move_x,move_y))
+      can_move_on = TRUE;
+
+    if (can_move_on && rnd > rnd_value/8)
+      MovDir[x][y] = old_move_dir;
+    else if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir);
+    else if (can_turn_left && rnd > rnd_value/8)
+      MovDir[x][y] = left_dir;
+    else if (can_turn_right && rnd > rnd_value/8)
+      MovDir[x][y] = right_dir;
+    else
+      MovDir[x][y] = back_dir;
+
+    if (!IS_FREE(x+move_xy[MovDir[x][y]].x,y+move_xy[MovDir[x][y]].y))
+      MovDir[x][y] = old_move_dir;
 
-    MovDelay[x][y]=3+RND(20);
+    MovDelay[x][y] = 0;
   }
-  else if (element==EL_ZOMBIE)
+  else if (element==EL_ROBOT || element==EL_SONDE ||
+	   element==EL_MAULWURF || element==EL_PINGUIN)
   {
     int attr_x = JX, attr_y = JY;
+    int newx, newy;
 
-    if (ZX>=0 && ZY>=0)
+    if (PlayerGone)
+    {
+      attr_x = ExitX;
+      attr_y = ExitY;
+    }
+
+    if (element==EL_ROBOT && ZX>=0 && ZY>=0)
     {
       attr_x = ZX;
       attr_y = ZY;
     }
 
-    MovDir[x][y]=MV_NO_MOVING;
+    if (element==EL_MAULWURF || element==EL_PINGUIN)
+    {
+      int i;
+      static int xy[4][2] =
+      {
+	{ 0,-1 },
+	{ -1,0 },
+	{ +1,0 },
+	{ 0,+1 }
+      };
+
+      for(i=0;i<4;i++)
+      {
+    	int ex = x+xy[i%4][0];
+    	int ey = y+xy[i%4][1];
+
+    	if (IN_LEV_FIELD(ex,ey) && Feld[ex][ey] == EL_AUSGANG_AUF)
+	{
+	  attr_x = ex;
+ 	  attr_y = ey;
+	  break;
+	}
+      }
+    }
+
+    MovDir[x][y] = MV_NO_MOVING;
     if (attr_x<x)
-      MovDir[x][y]|=MV_LEFT;
+      MovDir[x][y] |= (GameOver ? MV_RIGHT : MV_LEFT);
     else if (attr_x>x)
-      MovDir[x][y]|=MV_RIGHT;
+      MovDir[x][y] |= (GameOver ? MV_LEFT : MV_RIGHT);
     if (attr_y<y)
-      MovDir[x][y]|=MV_UP;
+      MovDir[x][y] |= (GameOver ? MV_DOWN : MV_UP);
     else if (attr_y>y)
-      MovDir[x][y]|=MV_DOWN;
-    if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
-      MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+      MovDir[x][y] |= (GameOver ? MV_UP : MV_DOWN);
+
+    if (element==EL_ROBOT)
+    {
+      if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
+	MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+      Moving2Blocked(x,y,&newx,&newy);
 
-    MovDelay[x][y] = 8+8*RND(2);
+      if (IN_LEV_FIELD(newx,newy) && IS_FREE_OR_PLAYER(newx,newy))
+	MovDelay[x][y] = 8+8*!RND(3);
+      else
+	MovDelay[x][y] = 16;
+    }
+    else
+    {
+      MovDelay[x][y] = 1;
+
+      if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
+      {
+	BOOL first_horiz = RND(2);
+	int new_move_dir = MovDir[x][y];
+
+	MovDir[x][y] =
+	  new_move_dir & (first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+	Moving2Blocked(x,y,&newx,&newy);
+
+	if (IN_LEV_FIELD(newx,newy) &&
+	    (IS_FREE(newx,newy) ||
+	     Feld[newx][newy] == EL_SALZSAEURE ||
+	     ((element == EL_MAULWURF || element==EL_PINGUIN) &&
+	      (Feld[newx][newy] == EL_AUSGANG_AUF ||
+	       IS_MAMPF3(Feld[newx][newy])))))
+	  return;
+
+	MovDir[x][y] =
+	  new_move_dir & (!first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+	Moving2Blocked(x,y,&newx,&newy);
+
+	if (IN_LEV_FIELD(newx,newy) &&
+	    (IS_FREE(newx,newy) ||
+	     Feld[newx][newy] == EL_SALZSAEURE ||
+	     ((element == EL_MAULWURF || element==EL_PINGUIN) &&
+	      (Feld[newx][newy] == EL_AUSGANG_AUF ||
+	       IS_MAMPF3(Feld[newx][newy])))))
+	  return;
+
+	MovDir[x][y] = old_move_dir;
+	return;
+      }
+    }
   }
 }
 
@@ -1560,6 +1456,26 @@ void StartMoving(int x, int y)
 
   if (CAN_FALL(element) && y<lev_fieldy-1)
   {
+    /* check if this element is just being pushed */
+    if ((x>0 && IS_PLAYER(x-1,y)) || (x<lev_fieldx-1 && IS_PLAYER(x+1,y)))
+    {
+      int i;
+
+      for(i=0; i<MAX_PLAYERS; i++)
+      {
+	struct PlayerInfo *pl = &stored_player[i];
+
+	if (pl->active && pl->Pushing && pl->MovPos)
+	{
+	  int nextJX = pl->JX + (pl->JX - pl->lastJX);
+	  int nextJY = pl->JY + (pl->JY - pl->lastJY);
+
+	  if (x == nextJX && y == nextJY)
+	    return;
+	}
+      }
+    }
+
     if (element==EL_MORAST_VOLL)
     {
       if (IS_FREE(x,y+1))
@@ -1570,10 +1486,8 @@ void StartMoving(int x, int y)
       }
       else if (Feld[x][y+1]==EL_MORAST_LEER)
       {
-	CheckMoving=TRUE;
-
 	if (!MovDelay[x][y])
-	  MovDelay[x][y] = 16;
+	  MovDelay[x][y] = TILEY + 1;
 
 	if (MovDelay[x][y])
 	{
@@ -1599,13 +1513,57 @@ void StartMoving(int x, int y)
 	Feld[x][y] = EL_CHANGED(Store2[x][y]);
 	Store[x][y] = EL_SIEB_LEER;
       }
+      else if (Feld[x][y+1]==EL_SIEB_LEER)
+      {
+	if (!MovDelay[x][y])
+	  MovDelay[x][y] = TILEY/4 + 1;
+
+	if (MovDelay[x][y])
+	{
+	  MovDelay[x][y]--;
+	  if (MovDelay[x][y])
+	    return;
+	}
+
+	Feld[x][y] = EL_SIEB_LEER;
+	Feld[x][y+1] = EL_SIEB_VOLL;
+	Store2[x][y+1] = EL_CHANGED(Store2[x][y]);
+	Store2[x][y] = 0;
+      }
+    }
+    else if (element==EL_SIEB2_VOLL)
+    {
+      if (IS_FREE(x,y+1))
+      {
+	InitMovingField(x,y,MV_DOWN);
+	Feld[x][y] = EL_CHANGED2(Store2[x][y]);
+	Store[x][y] = EL_SIEB2_LEER;
+      }
+      else if (Feld[x][y+1]==EL_SIEB2_LEER)
+      {
+	if (!MovDelay[x][y])
+	  MovDelay[x][y] = TILEY/4 + 1;
+
+	if (MovDelay[x][y])
+	{
+	  MovDelay[x][y]--;
+	  if (MovDelay[x][y])
+	    return;
+	}
+
+	Feld[x][y] = EL_SIEB2_LEER;
+	Feld[x][y+1] = EL_SIEB2_VOLL;
+	Store2[x][y+1] = EL_CHANGED2(Store2[x][y]);
+	Store2[x][y] = 0;
+      }
     }
-    else if (CAN_CHANGE(element) && Feld[x][y+1]==EL_SIEB_LEER)
+    else if (SiebAktiv && CAN_CHANGE(element) &&
+	     (Feld[x][y+1]==EL_SIEB_LEER || Feld[x][y+1]==EL_SIEB2_LEER))
     {
       InitMovingField(x,y,MV_DOWN);
-      Store[x][y] = EL_SIEB_VOLL;
+      Store[x][y] =
+	(Feld[x][y+1]==EL_SIEB_LEER ? EL_SIEB_VOLL : EL_SIEB2_VOLL);
       Store2[x][y+1] = element;
-      SiebAktiv = 330;
     }
     else if (CAN_SMASH(element) && Feld[x][y+1]==EL_SALZSAEURE)
     {
@@ -1613,7 +1571,7 @@ void StartMoving(int x, int y)
       InitMovingField(x,y,MV_DOWN);
       Store[x][y] = EL_SALZSAEURE;
     }
-    else if (CAN_SMASH(element) && Feld[x][y+1]==EL_BLOCKED)
+    else if (CAN_SMASH(element) && Feld[x][y+1]==EL_BLOCKED && JustHit[x][y])
     {
       Impact(x,y);
     }
@@ -1623,19 +1581,21 @@ void StartMoving(int x, int y)
     }
     else if (element==EL_TROPFEN)
     {
-      Feld[x][y] = EL_AMOEBING2;
+      Feld[x][y] = EL_AMOEBING;
+      Store[x][y] = EL_AMOEBE_NASS;
     }
-    else if (SLIPPERY(Feld[x][y+1]) && !Store[x][y+1])
+    else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1])
     {
-      int left  = (x>0 && IS_FREE(x-1,y) &&
-		   (IS_FREE(x-1,y+1) || Feld[x-1][y+1]==EL_SALZSAEURE));
-      int right = (x<lev_fieldx-1 && IS_FREE(x+1,y) &&
-		   (IS_FREE(x+1,y+1) || Feld[x+1][y+1]==EL_SALZSAEURE));
+      BOOL left  = (x>0 && IS_FREE(x-1,y) &&
+		    (IS_FREE(x-1,y+1) || Feld[x-1][y+1]==EL_SALZSAEURE));
+      BOOL right = (x<lev_fieldx-1 && IS_FREE(x+1,y) &&
+		    (IS_FREE(x+1,y+1) || Feld[x+1][y+1]==EL_SALZSAEURE));
 
       if (left || right)
       {
-	if (left && right)
-	  left = !(right=RND(2));
+	if (left && right && game_emulation != EMU_BOULDERDASH)
+	  left = !(right = RND(2));
+
 	InitMovingField(x,y,left ? MV_LEFT : MV_RIGHT);
       }
     }
@@ -1644,14 +1604,16 @@ void StartMoving(int x, int y)
   {
     int newx,newy;
 
-    CheckMoving = TRUE;
-
     if (!MovDelay[x][y])	/* neuer Schritt / noch nicht gewartet */
     {
-      if (element==EL_ZOMBIE || element==EL_KAEFER || element==EL_FLIEGER)
+      /* Alle Figuren, die nach jeden Schritt die Richtung wechseln können.
+       * (MAMPFER, MAMPFER2 und PACMAN laufen bis zur nächsten Wand.)
+       */
+
+      if (element!=EL_MAMPFER && element!=EL_MAMPFER2 && element!=EL_PACMAN)
       {
 	TurnRound(x,y);
-	if (MovDelay[x][y] && (element==EL_KAEFER || element==EL_FLIEGER))
+	if (MovDelay[x][y] && (element == EL_KAEFER || element == EL_FLIEGER))
 	  DrawLevelField(x,y);
       }
     }
@@ -1660,7 +1622,7 @@ void StartMoving(int x, int y)
     {
       MovDelay[x][y]--;
 
-      if (element==EL_ZOMBIE || element==EL_MAMPFER)
+      if (element==EL_ROBOT || element==EL_MAMPFER || element==EL_MAMPFER2)
       {
 	int phase = MovDelay[x][y] % 8;
 
@@ -1668,22 +1630,64 @@ void StartMoving(int x, int y)
 	  phase = 7-phase;
 
 	if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-	  DrawGraphic(SCROLLX(x),SCROLLY(y),
-		      el2gfx(element)+phase);
+	  DrawGraphic(SCROLLX(x),SCROLLY(y), el2gfx(element)+phase);
 
-	if (element==EL_MAMPFER && MovDelay[x][y]%4==3)
+	if ((element==EL_MAMPFER || element==EL_MAMPFER2)
+	    && MovDelay[x][y]%4==3)
 	  PlaySoundLevel(x,y,SND_NJAM);
       }
+      else if (element==EL_DRACHE)
+      {
+	int i;
+	int dir = MovDir[x][y];
+	int dx = (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
+	int dy = (dir == MV_UP   ? -1 : dir == MV_DOWN  ? +1 : 0);
+	int graphic = (dir == MV_LEFT	? GFX_FLAMMEN_LEFT :
+		       dir == MV_RIGHT	? GFX_FLAMMEN_RIGHT :
+		       dir == MV_UP	? GFX_FLAMMEN_UP :
+		       dir == MV_DOWN	? GFX_FLAMMEN_DOWN : GFX_LEERRAUM);
+	int phase = FrameCounter % 2;
+
+	for(i=1;i<=3;i++)
+	{
+	  int xx = x + i*dx, yy = y + i*dy;
+	  int sx = SCROLLX(xx), sy = SCROLLY(yy);
+
+	  if (!IN_LEV_FIELD(xx,yy) ||
+	      IS_SOLID(Feld[xx][yy]) || Feld[xx][yy]==EL_EXPLODING)
+	    break;
+
+	  if (MovDelay[x][y])
+	  {
+	    int flamed = MovingOrBlocked2Element(xx,yy);
+
+	    if (IS_ENEMY(flamed) || IS_EXPLOSIVE(flamed))
+	      Bang(xx,yy);
+	    else
+	      RemoveMovingField(xx,yy);
+
+	    Feld[xx][yy] = EL_BURNING;
+	    if (IN_SCR_FIELD(sx,sy))
+	      DrawGraphic(sx,sy, graphic + phase*3 + i-1);
+	  }
+	  else
+	  {
+	    if (Feld[xx][yy] == EL_BURNING)
+	      Feld[xx][yy] = EL_LEERRAUM;
+	    DrawLevelField(xx,yy);
+	  }
+	}
+      }
 
       if (MovDelay[x][y])
 	return;
     }
 
-    if (element==EL_KAEFER)
+    if (element==EL_KAEFER || element==EL_BUTTERFLY)
     {
       PlaySoundLevel(x,y,SND_KLAPPER);
     }
-    else if (element==EL_FLIEGER)
+    else if (element==EL_FLIEGER || element==EL_FIREFLY)
     {
       PlaySoundLevel(x,y,SND_ROEHR);
     }
@@ -1692,37 +1696,194 @@ void StartMoving(int x, int y)
 
     Moving2Blocked(x,y,&newx,&newy);	/* wohin soll's gehen? */
 
-    if (PLAYER(newx,newy))		/* Spieler erwischt */
+    if (IS_ENEMY(element) && IS_PLAYER(newx,newy))
     {
+      /* Spieler erwischt */
       MovDir[x][y] = 0;
       KillHero();
       return;
     }
+    else if ((element == EL_MAULWURF || element == EL_PINGUIN ||
+	      element==EL_ROBOT || element==EL_SONDE) &&
+	     IN_LEV_FIELD(newx,newy) &&
+	     MovDir[x][y]==MV_DOWN && Feld[newx][newy]==EL_SALZSAEURE)
+    {
+      Blurb(x,y);
+      Store[x][y] = EL_SALZSAEURE;
+    }
+    else if ((element == EL_MAULWURF || element == EL_PINGUIN) &&
+	     IN_LEV_FIELD(newx,newy))
+    {
+      if (Feld[newx][newy] == EL_AUSGANG_AUF)
+      {
+	Feld[x][y] = EL_LEERRAUM;
+	DrawLevelField(x,y);
+
+	PlaySoundLevel(newx,newy,SND_BUING);
+	if (IN_SCR_FIELD(SCROLLX(newx),SCROLLY(newy)))
+	  DrawGraphicThruMask(SCROLLX(newx),SCROLLY(newy),el2gfx(element));
+
+	local_player->friends_still_needed--;
+	if (!local_player->friends_still_needed && PlayerGone && !GameOver)
+	  LevelSolved = GameOver = TRUE;
+
+	return;
+      }
+      else if (IS_MAMPF3(Feld[newx][newy]))
+      {
+	if (DigField(newx,newy, 0,0, DF_DIG) == MF_MOVING)
+	  DrawLevelField(newx,newy);
+	else
+	  MovDir[x][y] = MV_NO_MOVING;
+      }
+      else if (!IS_FREE(newx,newy))
+      {
+	if (IS_PLAYER(x,y))
+	  DrawPlayerField(x,y);
+	else
+	  DrawLevelField(x,y);
+	return;
+      }
+    }
+    else if (element == EL_SCHWEIN && IN_LEV_FIELD(newx,newy))
+    {
+      if (IS_GEM(Feld[newx][newy]))
+      {
+	if (IS_MOVING(newx,newy))
+	  RemoveMovingField(newx,newy);
+	else
+	{
+	  Feld[newx][newy] = EL_LEERRAUM;
+	  DrawLevelField(newx,newy);
+	}
+      }
+      else if (!IS_FREE(newx,newy))
+      {
+	if (IS_PLAYER(x,y))
+	  DrawPlayerField(x,y);
+	else
+	  DrawLevelField(x,y);
+	return;
+      }
+    }
+    else if (element==EL_DRACHE && IN_LEV_FIELD(newx,newy))
+    {
+      if (!IS_FREE(newx,newy))
+      {
+	if (IS_PLAYER(x,y))
+	  DrawPlayerField(x,y);
+	else
+	  DrawLevelField(x,y);
+	return;
+      }
+      else
+      {
+	BOOL wanna_flame = !RND(10);
+	int dx = newx - x, dy = newy - y;
+	int newx1 = newx+1*dx, newy1 = newy+1*dy;
+	int newx2 = newx+2*dx, newy2 = newy+2*dy;
+	int element1 = (IN_LEV_FIELD(newx1,newy1) ?
+			MovingOrBlocked2Element(newx1,newy1) : EL_BETON);
+	int element2 = (IN_LEV_FIELD(newx2,newy2) ?
+			MovingOrBlocked2Element(newx2,newy2) : EL_BETON);
+
+	if ((wanna_flame || IS_ENEMY(element1) || IS_ENEMY(element2)) &&
+	    element1 != EL_DRACHE && element2 != EL_DRACHE &&
+	    element1 != EL_BURNING && element2 != EL_BURNING)
+	{
+	  if (IS_PLAYER(x,y))
+	    DrawPlayerField(x,y);
+	  else
+	    DrawLevelField(x,y);
+
+	  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;
+	  if (IN_LEV_FIELD(newx2,newy2) && Feld[newx2][newy2] == EL_LEERRAUM)
+	    Feld[newx2][newy2] = EL_BURNING;
+	  return;
+	}
+      }
+    }
     else if (element==EL_MAMPFER && IN_LEV_FIELD(newx,newy) &&
 	     Feld[newx][newy]==EL_DIAMANT)
     {
-      Feld[newx][newy] = EL_LEERRAUM;
-      DrawLevelField(newx,newy);
+      if (IS_MOVING(newx,newy))
+	RemoveMovingField(newx,newy);
+      else
+      {
+	Feld[newx][newy] = EL_LEERRAUM;
+	DrawLevelField(newx,newy);
+      }
+    }
+    else if (element==EL_MAMPFER2 && IN_LEV_FIELD(newx,newy) &&
+	     IS_MAMPF2(Feld[newx][newy]))
+    {
+      if (AmoebaNr[newx][newy])
+      {
+	AmoebaCnt2[AmoebaNr[newx][newy]]--;
+	if (Feld[newx][newy]==EL_AMOEBE_VOLL || Feld[newx][newy]==EL_AMOEBE_BD)
+	  AmoebaCnt[AmoebaNr[newx][newy]]--;
+      }
+
+      if (IS_MOVING(newx,newy))
+	RemoveMovingField(newx,newy);
+      else
+      {
+	Feld[newx][newy] = EL_LEERRAUM;
+	DrawLevelField(newx,newy);
+      }
     }
     else if (element==EL_PACMAN && IN_LEV_FIELD(newx,newy) &&
 	     IS_AMOEBOID(Feld[newx][newy]))
     {
+      if (AmoebaNr[newx][newy])
+      {
+	AmoebaCnt2[AmoebaNr[newx][newy]]--;
+	if (Feld[newx][newy]==EL_AMOEBE_VOLL || Feld[newx][newy]==EL_AMOEBE_BD)
+	  AmoebaCnt[AmoebaNr[newx][newy]]--;
+      }
+
       Feld[newx][newy] = EL_LEERRAUM;
       DrawLevelField(newx,newy);
     }
-    else if (element==EL_ZOMBIE && IN_LEV_FIELD(newx,newy) &&
-	     MovDir[x][y]==MV_DOWN && Feld[newx][newy]==EL_SALZSAEURE)
-    {
-      Blurb(x,y);
-      Store[x][y] = EL_SALZSAEURE;
-    }
     else if (!IN_LEV_FIELD(newx,newy) || !IS_FREE(newx,newy))
     {					/* gegen Wand gelaufen */
       TurnRound(x,y);
-      DrawLevelField(x,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, 4, ANIM_NORMAL);
+      else if (element==EL_SONDE)
+      {
+	int i;
+
+	/* check if this element is just being pushed */
+	for(i=0; i<MAX_PLAYERS; i++)
+	{
+	  struct PlayerInfo *pl = &stored_player[i];
+
+	  if (pl->active && pl->Pushing && pl->GfxPos)
+	  {
+	    int nextJX = pl->JX + (pl->JX - pl->lastJX);
+	    int nextJY = pl->JY + (pl->JY - pl->lastJY);
+
+	    if (x == nextJX && y == nextJY)
+	      return;
+	  }
+	}
+
+	DrawGraphicAnimation(x,y, GFX_SONDE_START, 8, 2, ANIM_NORMAL);
+      }
+
       return;
     }
 
+    if (element==EL_ROBOT && IN_SCR_FIELD(x,y))
+      PlaySoundLevel(x,y,SND_SCHLURF);
+
     InitMovingField(x,y,MovDir[x][y]);
   }
 
@@ -1738,7 +1899,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;
@@ -1751,8 +1912,8 @@ void ContinueMoving(int x, int y)
 
   if (ABS(MovPos[x][y])>=TILEX)		/* Zielfeld erreicht */
   {
-    Feld[x][y]=EL_LEERRAUM;
-    Feld[newx][newy]=element;
+    Feld[x][y] = EL_LEERRAUM;
+    Feld[newx][newy] = element;
 
     if (Store[x][y]==EL_MORAST_VOLL)
     {
@@ -1768,52 +1929,196 @@ void ContinueMoving(int x, int y)
     else if (Store[x][y]==EL_SIEB_VOLL)
     {
       Store[x][y] = 0;
-      Feld[newx][newy] = EL_SIEB_VOLL;
-      element = EL_SIEB_VOLL;
+      element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB_VOLL : EL_SIEB_TOT);
     }
     else if (Store[x][y]==EL_SIEB_LEER)
     {
-      Store[x][y] = Store2[x][y] = 0;
-      Feld[x][y] = EL_SIEB_LEER;
+      Store[x][y] = Store2[x][y] = 0;
+      Feld[x][y] = (SiebAktiv ? EL_SIEB_LEER : EL_SIEB_TOT);
+    }
+    else if (Store[x][y]==EL_SIEB2_VOLL)
+    {
+      Store[x][y] = 0;
+      element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB2_VOLL : EL_SIEB2_TOT);
+    }
+    else if (Store[x][y]==EL_SIEB2_LEER)
+    {
+      Store[x][y] = Store2[x][y] = 0;
+      Feld[x][y] = (SiebAktiv ? EL_SIEB2_LEER : EL_SIEB2_TOT);
+    }
+    else if (Store[x][y]==EL_SALZSAEURE)
+    {
+      Store[x][y] = 0;
+      Feld[newx][newy] = EL_SALZSAEURE;
+      element = EL_SALZSAEURE;
+    }
+    else if (Store[x][y]==EL_AMOEBE_NASS)
+    {
+      Store[x][y] = 0;
+      Feld[x][y] = EL_AMOEBE_NASS;
+    }
+
+    MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
+    MovDelay[newx][newy] = 0;
+
+    if (!CAN_MOVE(element))
+      MovDir[newx][newy] = 0;
+
+    DrawLevelField(x,y);
+    DrawLevelField(newx,newy);
+
+    Stop[newx][newy] = TRUE;
+    JustHit[x][newy] = 3;
+
+    if (DONT_TOUCH(element))	/* Käfer oder Flieger */
+    {
+      TestIfBadThingHitsHero();
+      TestIfBadThingHitsFriend(newx,newy);
+      TestIfBadThingHitsOtherBadThing(newx,newy);
+    }
+    else if (element == EL_PINGUIN)
+      TestIfFriendHitsBadThing(newx,newy);
+
+    if (CAN_SMASH(element) && direction==MV_DOWN &&
+	(newy==lev_fieldy-1 || !IS_FREE(x,newy+1)))
+      Impact(x,newy);
+  }
+  else				/* noch in Bewegung */
+    DrawLevelField(x,y);
+}
+
+int AmoebeNachbarNr(int ax, int ay)
+{
+  int i;
+  int element = Feld[ax][ay];
+  int group_nr = 0;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+
+  for(i=0;i<4;i++)
+  {
+    int x = ax+xy[i%4][0];
+    int y = ay+xy[i%4][1];
+
+    if (!IN_LEV_FIELD(x,y))
+      continue;
+
+    if (Feld[x][y]==element && AmoebaNr[x][y]>0)
+      group_nr = AmoebaNr[x][y];
+  }
+
+  return(group_nr);
+}
+
+void AmoebenVereinigen(int ax, int ay)
+{
+  int i,x,y,xx,yy;
+  int new_group_nr = AmoebaNr[ax][ay];
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+
+  if (!new_group_nr)
+    return;
+
+  for(i=0;i<4;i++)
+  {
+    x = ax+xy[i%4][0];
+    y = ay+xy[i%4][1];
+
+    if (!IN_LEV_FIELD(x,y))
+      continue;
+
+    if ((Feld[x][y]==EL_AMOEBE_VOLL ||
+	 Feld[x][y]==EL_AMOEBE_BD ||
+	 Feld[x][y]==EL_AMOEBE_TOT) &&
+	AmoebaNr[x][y] != new_group_nr)
+    {
+      int old_group_nr = AmoebaNr[x][y];
+
+      AmoebaCnt[new_group_nr] += AmoebaCnt[old_group_nr];
+      AmoebaCnt[old_group_nr] = 0;
+      AmoebaCnt2[new_group_nr] += AmoebaCnt2[old_group_nr];
+      AmoebaCnt2[old_group_nr] = 0;
+
+      for(yy=0;yy<lev_fieldy;yy++) for(xx=0;xx<lev_fieldx;xx++)
+	if (AmoebaNr[xx][yy]==old_group_nr)
+	  AmoebaNr[xx][yy] = new_group_nr;
     }
-    else if (Store[x][y]==EL_SALZSAEURE)
+  }
+}
+
+void AmoebeUmwandeln(int ax, int ay)
+{
+  int i,x,y;
+  int group_nr = AmoebaNr[ax][ay];
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+
+  if (Feld[ax][ay]==EL_AMOEBE_TOT)
+  {
+    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
     {
-      Store[x][y] = 0;
-      Feld[newx][newy] = EL_SALZSAEURE;
-      element = EL_SALZSAEURE;
+      if (Feld[x][y]==EL_AMOEBE_TOT && AmoebaNr[x][y]==group_nr)
+      {
+	AmoebaNr[x][y] = 0;
+	Feld[x][y] = EL_AMOEBA2DIAM;
+      }
     }
-    else if (Store[x][y]==EL_AMOEBE2)
+    Bang(ax,ay);
+  }
+  else
+  {
+    for(i=0;i<4;i++)
     {
-      Store[x][y] = 0;
-      Feld[x][y] = EL_AMOEBE2;
-    }
+      x = ax+xy[i%4][0];
+      y = ay+xy[i%4][1];
 
-    MovPos[x][y] = MovDir[x][y] = 0;
-
-    if (!CAN_MOVE(element))
-      MovDir[newx][newy] = 0;
+      if (!IN_LEV_FIELD(x,y))
+	continue;
 
-    DrawLevelField(x,y);
-    DrawLevelField(newx,newy);
+      if (Feld[x][y]==EL_AMOEBA2DIAM)
+	Bang(x,y);
+    }
+  }
+}
 
-    Stop[newx][newy]=TRUE;
-    CheckMoving=TRUE;
+void AmoebeUmwandeln2(int ax, int ay, int new_element)
+{
+  int x,y;
+  int group_nr = AmoebaNr[ax][ay];
+  BOOL done = FALSE;
 
-    if (DONT_TOUCH(element))	/* Käfer oder Flieger */
+  for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+  {
+    if (AmoebaNr[x][y]==group_nr &&
+	(Feld[x][y]==EL_AMOEBE_TOT ||
+	 Feld[x][y]==EL_AMOEBE_BD ||
+	 Feld[x][y]==EL_AMOEBING))
     {
-      TestIfBadThingHitsHero();
-      TestIfBadThingHitsOtherBadThing(newx,newy);
+      AmoebaNr[x][y] = 0;
+      Feld[x][y] = new_element;
+      DrawLevelField(x,y);
+      done = TRUE;
     }
-
-    if (CAN_SMASH(element) && direction==MV_DOWN &&
-	(newy==lev_fieldy-1 || !IS_FREE(x,newy+1)))
-      Impact(x,newy);
-  }
-  else				/* noch in Bewegung */
-  {
-    DrawLevelField(x,y);
-    CheckMoving=TRUE;
   }
+
+  if (done)
+    PlaySoundLevel(ax,ay,new_element==EL_FELSBROCKEN ? SND_KLOPF : SND_PLING);
 }
 
 void AmoebeWaechst(int x, int y)
@@ -1821,13 +2126,11 @@ void AmoebeWaechst(int x, int y)
   static long sound_delay = 0;
   static int sound_delay_value = 0;
 
-  CheckExploding=TRUE;
-
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
   {
-    MovDelay[x][y] = 4;
+    MovDelay[x][y] = 7;
 
-    if (DelayReached(&sound_delay,sound_delay_value))
+    if (DelayReached(&sound_delay, sound_delay_value))
     {
       PlaySoundLevel(x,y,SND_AMOEBE);
       sound_delay_value = 30;
@@ -1837,12 +2140,13 @@ void AmoebeWaechst(int x, int y)
   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_AMOEBING+3-MovDelay[x][y]);
+    if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AMOEBING+3-MovDelay[x][y]/2);
 
     if (!MovDelay[x][y])
     {
-      Feld[x][y] = (Feld[x][y]==EL_AMOEBING2 ? EL_AMOEBE2 : EL_AMOEBE3);
+      Feld[x][y] = Store[x][y];
+      Store[x][y] = 0;
       DrawLevelField(x,y);
     }
   }
@@ -1850,28 +2154,26 @@ void AmoebeWaechst(int x, int y)
 
 void AmoebeAbleger(int ax, int ay)
 {
-  int i,j,start;
+  int i;
+  int element = Feld[ax][ay];
   int newax = ax, neway = ay;
-  BOOL waiting_for_player = FALSE;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
-  CheckExploding=TRUE;
-
   if (!level.tempo_amoebe)
   {
-    Feld[ax][ay] = EL_AMOEBE1;
+    Feld[ax][ay] = EL_AMOEBE_TOT;
     DrawLevelField(ax,ay);
     return;
   }
 
   if (!MovDelay[ax][ay])	/* neue Amoebe / noch nicht gewartet */
-    MovDelay[ax][ay] = RND(33*20/(1+level.tempo_amoebe));
+    MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25/(1+level.tempo_amoebe));
 
   if (MovDelay[ax][ay])		/* neue Amoebe / in Wartezustand */
   {
@@ -1880,72 +2182,98 @@ void AmoebeAbleger(int ax, int ay)
       return;
   }
 
-  if (Feld[ax][ay]==EL_AMOEBE3)
+  if (element==EL_AMOEBE_NASS)	/* tropfende Amöbe */
+  {
+    int start = RND(4);
+    int x = ax+xy[start][0];
+    int y = ay+xy[start][1];
+
+    if (!IN_LEV_FIELD(x,y))
+      return;
+
+    if (IS_FREE(x,y) ||
+	Feld[x][y]==EL_ERDREICH || Feld[x][y]==EL_MORAST_LEER)
+    {
+      newax = x;
+      neway = y;
+    }
+
+    if (newax==ax && neway==ay)
+      return;
+  }
+  else				/* normale oder "gefüllte" Amöbe */
   {
-    start = RND(4);
+    int start = RND(4);
+    BOOL waiting_for_player = FALSE;
+
     for(i=0;i<4;i++)
     {
-      int x,y;
+      int j = (start+i)%4;
+      int x = ax+xy[j][0];
+      int y = ay+xy[j][1];
 
-      j = (start+i)%4;
-      x = ax+xy[j][0];
-      y = ay+xy[j][1];
       if (!IN_LEV_FIELD(x,y))
 	continue;
 
       if (IS_FREE(x,y) ||
 	  Feld[x][y]==EL_ERDREICH || Feld[x][y]==EL_MORAST_LEER)
       {
-	newax=x;
-	neway=y;
+	newax = x;
+	neway = y;
 	break;
       }
-      else if (PLAYER(x,y))
+      else if (IS_PLAYER(x,y))
 	waiting_for_player = TRUE;
     }
 
     if (newax==ax && neway==ay)
     {
-      if (Feld[ax][ay]==EL_AMOEBE3 && i==4 && !waiting_for_player)
+      if (i==4 && !waiting_for_player)
       {
-	Feld[ax][ay] = EL_AMOEBE1;
+	Feld[ax][ay] = EL_AMOEBE_TOT;
 	DrawLevelField(ax,ay);
+	AmoebaCnt[AmoebaNr[ax][ay]]--;
+
+	if (AmoebaCnt[AmoebaNr[ax][ay]]<=0)	/* Amöbe vollständig tot */
+	{
+	  if (element==EL_AMOEBE_VOLL)
+	    AmoebeUmwandeln(ax,ay);
+	  else if (element==EL_AMOEBE_BD)
+	    AmoebeUmwandeln2(ax,ay,level.amoebe_inhalt);
+	}
       }
       return;
     }
-  }
-  else
-  {
-    int x,y;
+    else if (element==EL_AMOEBE_VOLL || element==EL_AMOEBE_BD)
+    {
+      int new_group_nr = AmoebaNr[ax][ay];
 
-    start = RND(4);
-    x = ax+xy[start][0];
-    y = ay+xy[start][1];
-    if (!IN_LEV_FIELD(x,y))
-      return;
+      AmoebaNr[newax][neway] = new_group_nr;
+      AmoebaCnt[new_group_nr]++;
+      AmoebaCnt2[new_group_nr]++;
+      AmoebenVereinigen(newax,neway);
 
-    if (IS_FREE(x,y) ||
-	  Feld[x][y]==EL_ERDREICH || Feld[x][y]==EL_MORAST_LEER)
-    {
-      newax=x;
-      neway=y;
+      if (AmoebaCnt2[new_group_nr] >= 200 && element==EL_AMOEBE_BD)
+      {
+	AmoebeUmwandeln2(newax,neway,EL_FELSBROCKEN);
+	return;
+      }
     }
-
-    if (newax==ax && neway==ay)
-      return;
   }
 
-  if (Feld[ax][ay]==EL_AMOEBE3)
-    Feld[newax][neway] = EL_AMOEBING3;
-  else if (neway==lev_fieldy-1)
-    Feld[newax][neway] = EL_AMOEBING2;
-  else if (neway<=ay || !IS_FREE(newax,neway))
+  if (element!=EL_AMOEBE_NASS || neway<ay || !IS_FREE(newax,neway) ||
+      (neway==lev_fieldy-1 && newax!=ax))
+  {
+    Feld[newax][neway] = EL_AMOEBING;
+    Store[newax][neway] = element;
+  }
+  else if (neway==ay)
     Feld[newax][neway] = EL_TROPFEN;
   else
   {
     InitMovingField(ax,ay,MV_DOWN);
-    Feld[ax][ay]=EL_TROPFEN;
-    Store[ax][ay]=EL_AMOEBE2;
+    Feld[ax][ay] = EL_TROPFEN;
+    Store[ax][ay] = EL_AMOEBE_NASS;
     ContinueMoving(ax,ay);
     return;
   }
@@ -1957,11 +2285,9 @@ 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];
 
-  CheckExploding=TRUE;
-
   if (Stop[ax][ay])
     return;
 
@@ -1990,7 +2316,8 @@ void Life(int ax, int ay)
       if (!IN_LEV_FIELD(x,y) || (x==xx && y==yy))
 	continue;
 
-      if ((Feld[x][y]==element && !Stop[x][y]) ||
+      if (((Feld[x][y]==element || (element==EL_LIFE && IS_PLAYER(x,y))) &&
+	   !Stop[x][y]) ||
 	  (IS_FREE(x,y) && Stop[x][y]))
 	nachbarn++;
     }
@@ -2021,10 +2348,9 @@ void Life(int ax, int ay)
 
 void Ablenk(int x, int y)
 {
-  CheckExploding=TRUE;
-
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 33*(level.dauer_ablenk/10);
+    MovDelay[x][y] = level.dauer_ablenk * FRAMES_PER_SECOND;
+
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
     MovDelay[x][y]--;
@@ -2038,143 +2364,550 @@ void Ablenk(int x, int y)
     }
   }
 
+  Feld[x][y] = EL_ABLENK_AUS;
+  DrawLevelField(x,y);
+  if (ZX==x && ZY==y)
+    ZX = ZY = -1;
+}
+
+void Birne(int x, int y)
+{
+  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+    MovDelay[x][y] = 800;
+
+  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  {
+    MovDelay[x][y]--;
+    if (MovDelay[x][y])
+    {
+      if (!(MovDelay[x][y]%5))
+      {
+	if (!(MovDelay[x][y]%10))
+	  Feld[x][y]=EL_ABLENK_EIN;
+	else
+	  Feld[x][y]=EL_ABLENK_AUS;
+	DrawLevelField(x,y);
+	Feld[x][y]=EL_ABLENK_EIN;
+      }
+      return;
+    }
+  }
+
   Feld[x][y]=EL_ABLENK_AUS;
   DrawLevelField(x,y);
   if (ZX==x && ZY==y)
     ZX=ZY=-1;
 }
 
-void Birne(int x, int y)
+void Blubber(int x, int y)
+{
+  if (y > 0 && IS_MOVING(x,y-1) && MovDir[x][y-1] == MV_DOWN)
+    DrawLevelField(x,y-1);
+  else
+    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] = 7;
+
+  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  {
+    MovDelay[x][y]--;
+    if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_CRACKINGNUT+3-MovDelay[x][y]/2);
+
+    if (!MovDelay[x][y])
+    {
+      Feld[x][y] = EL_EDELSTEIN;
+      DrawLevelField(x,y);
+    }
+  }
+}
+
+void SiebAktivieren(int x, int y, int typ)
+{
+  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%16)/4);
+}
+
+void AusgangstuerPruefen(int x, int y)
+{
+  if (!local_player->gems_still_needed &&
+      !local_player->sokobanfields_still_needed &&
+      !local_player->lights_still_needed)
+  {
+    Feld[x][y] = EL_AUSGANG_ACT;
+
+    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 delay = 6;
+
+  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+    MovDelay[x][y] = 5*delay;
+
+  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  {
+    int tuer;
+
+    MovDelay[x][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])
+    {
+      Feld[x][y] = EL_AUSGANG_AUF;
+      DrawLevelField(x,y);
+    }
+  }
+}
+
+void AusgangstuerBlinken(int x, int y)
+{
+  DrawGraphicAnimation(x,y, GFX_AUSGANG_AUF, 4, 4, ANIM_OSCILLATE);
+}
+
+void EdelsteinFunkeln(int x, int y)
+{
+  if (!IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)) || IS_MOVING(x,y))
+    return;
+
+  if (Feld[x][y] == EL_EDELSTEIN_BD)
+    DrawGraphicAnimation(x,y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE);
+  else
+  {
+    if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
+      MovDelay[x][y] = 11 * !SimpleRND(500);
+
+    if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+    {
+      MovDelay[x][y]--;
+
+      if (direct_draw_on && MovDelay[x][y])
+	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)/2;
+
+	if (phase > 2)
+	  phase = 4-phase;
+
+	src_x  = SX + GFX_PER_LINE*TILEX;
+	src_y  = SY + phase*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],
+		  src_x,src_y, TILEX,TILEY, dest_x,dest_y);
+		  */
+
+	XSetClipMask(display, tile_clip_gc,
+		     tile_clipmask[GFX_MASK_SPARKLING + phase]);
+	XSetClipOrigin(display, tile_clip_gc, dest_x,dest_y);
+	XCopyArea(display, pix[PIX_BACK], drawto_field, tile_clip_gc,
+		  src_x,src_y, TILEX,TILEY, dest_x,dest_y);
+
+	if (direct_draw_on)
+	{
+	  XCopyArea(display,drawto_field,window,gc,
+		    dest_x,dest_y, TILEX,TILEY, dest_x,dest_y);
+	  SetDrawtoField(DRAW_DIRECT);
+	}
+      }
+    }
+  }
+}
+
+void MauerWaechst(int x, int y)
 {
-  CheckExploding=TRUE;
+  int delay = 6;
 
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 400;
+    MovDelay[x][y] = 3*delay;
 
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
-    MovDelay[x][y]--;
-    if (MovDelay[x][y])
+    int phase;
+
+    MovDelay[x][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);
+
+    if (!MovDelay[x][y])
+    {
+      if (Store[x][y]==MV_LEFT)
+      {
+	if (IN_LEV_FIELD(x-1,y) && IS_MAUER(Feld[x-1][y]))
+	  DrawLevelField(x-1,y);
+      }
+      else
+      {
+	if (IN_LEV_FIELD(x+1,y) && IS_MAUER(Feld[x+1][y]))
+	  DrawLevelField(x+1,y);
+      }
+
+      Feld[x][y] = EL_MAUER_LEBT;
+      Store[x][y] = 0;
+      DrawLevelField(x,y);
+    }
+  }
+}
+
+void MauerAbleger(int ax, int ay)
+{
+  BOOL links_frei = FALSE, rechts_frei = FALSE;
+  BOOL links_massiv = FALSE, rechts_massiv = FALSE;
+
+  if (!MovDelay[ax][ay])	/* neue Mauer / noch nicht gewartet */
+    MovDelay[ax][ay] = 6;
+
+  if (MovDelay[ax][ay])		/* neue Mauer / in Wartezustand */
+  {
+    MovDelay[ax][ay]--;
+    if (MovDelay[ax][ay])
+      return;
+  }
+
+  if (IN_LEV_FIELD(ax-1,ay) && IS_FREE(ax-1,ay))
+    links_frei = TRUE;
+  if (IN_LEV_FIELD(ax+1,ay) && IS_FREE(ax+1,ay))
+    rechts_frei = TRUE;
+
+  if (links_frei)
+  {
+    Feld[ax-1][ay] = EL_MAUERND;
+    Store[ax-1][ay] = MV_LEFT;
+    if (IN_SCR_FIELD(SCROLLX(ax-1),SCROLLY(ay)))
+      DrawGraphic(SCROLLX(ax-1),SCROLLY(ay),GFX_MAUER_L1);
+  }
+  if (rechts_frei)
+  {
+    Feld[ax+1][ay] = EL_MAUERND;
+    Store[ax+1][ay] = MV_RIGHT;
+    if (IN_SCR_FIELD(SCROLLX(ax+1),SCROLLY(ay)))
+      DrawGraphic(SCROLLX(ax+1),SCROLLY(ay),GFX_MAUER_R1);
+  }
+
+  if (links_frei || rechts_frei)
+    DrawLevelField(ax,ay);
+
+  if (!IN_LEV_FIELD(ax-1,ay) || IS_MAUER(Feld[ax-1][ay]))
+    links_massiv = TRUE;
+  if (!IN_LEV_FIELD(ax+1,ay) || IS_MAUER(Feld[ax+1][ay]))
+    rechts_massiv = TRUE;
+
+  if (links_massiv && rechts_massiv)
+    Feld[ax][ay] = EL_MAUERWERK;
+}
+
+void CheckForDragon(int x, int y)
+{
+  int i,j;
+  BOOL dragon_found = FALSE;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+
+  for(i=0;i<4;i++)
+  {
+    for(j=0;j<4;j++)
+    {
+      int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
+
+      if (IN_LEV_FIELD(xx,yy) &&
+	  (Feld[xx][yy] == EL_BURNING || Feld[xx][yy] == EL_DRACHE))
+      {
+	if (Feld[xx][yy] == EL_DRACHE)
+	  dragon_found = TRUE;
+      }
+      else
+	break;
+    }
+  }
+
+  if (!dragon_found)
+  {
+    for(i=0;i<4;i++)
     {
-      if (!(MovDelay[x][y]%5))
+      for(j=0;j<3;j++)
       {
-	if (!(MovDelay[x][y]%10))
-	  Feld[x][y]=EL_ABLENK_EIN;
-	else
-	  Feld[x][y]=EL_ABLENK_AUS;
-	DrawLevelField(x,y);
-	Feld[x][y]=EL_ABLENK_EIN;
+  	int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
+  
+  	if (IN_LEV_FIELD(xx,yy) && Feld[xx][yy] == EL_BURNING)
+  	{
+	  Feld[xx][yy] = EL_LEERRAUM;
+	  DrawLevelField(xx,yy);
+  	}
+  	else
+  	  break;
       }
-      return;
     }
   }
-
-  Feld[x][y]=EL_ABLENK_AUS;
-  DrawLevelField(x,y);
-  if (ZX==x && ZY==y)
-    ZX=ZY=-1;
 }
 
-void Blubber(int x, int y)
+void PlayerActions(int player_action)
 {
-  CheckExploding=TRUE;
-
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 20;
+  BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
+  int left	= player_action & JOY_LEFT;
+  int right	= player_action & JOY_RIGHT;
+  int up	= player_action & JOY_UP;
+  int down	= player_action & JOY_DOWN;
+  int button1	= player_action & JOY_BUTTON_1;
+  int button2	= player_action & JOY_BUTTON_2;
+  int dx	= (left ? -1	: right ? 1	: 0);
+  int dy	= (up   ? -1	: down  ? 1	: 0);
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (player_action)
   {
-    int blubber;
-
-    MovDelay[x][y]--;
-    blubber = MovDelay[x][y]/5;
-    if (!(MovDelay[x][y]%5) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_GEBLUBBER+3-blubber);
-  }
-}
+    player->frame_reset_delay = 0;
 
-void NussKnacken(int x, int y)
-{
-  CheckExploding=TRUE;
+    if (button1)
+      snapped = SnapField(dx,dy);
+    else
+    {
+      if (button2)
+	bombed = PlaceBomb();
+      moved = MoveFigure(dx,dy);
+    }
 
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 4;
+    if (tape.recording && (moved || snapped || bombed))
+    {
+      if (bombed && !moved)
+	player_action &= JOY_BUTTON;
+      TapeRecordAction(player_action);
+    }
+    else if (tape.playing && snapped)
+      SnapField(0,0);			/* stop snapping */
+  }
+  else
+  {
+    DigField(0,0,0,0,DF_NO_PUSH);
+    SnapField(0,0);
+    if (++player->frame_reset_delay > MoveSpeed)
+      player->Frame = 0;
+  }
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (tape.playing && !tape.pausing && !player_action &&
+      tape.counter < tape.length)
   {
-    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]);
+    int next_joy = tape.pos[tape.counter].joystickdata & (JOY_LEFT|JOY_RIGHT);
 
-    if (!MovDelay[x][y])
+    if (next_joy == JOY_LEFT || next_joy == JOY_RIGHT)
     {
-      Feld[x][y] = EL_EDELSTEIN;
-      DrawLevelField(x,y);
+      int dx = (next_joy == JOY_LEFT ? -1 : +1);
+
+      if (IN_LEV_FIELD(JX+dx,JY) && IS_PUSHABLE(Feld[JX+dx][JY]))
+      {
+	int el = Feld[JX+dx][JY];
+	int push_delay = (IS_SB_ELEMENT(el) || el==EL_SONDE ? 2 : 10);
+
+	if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
+	{
+	  player->MovDir = next_joy;
+	  player->Frame = FrameCounter % 4;
+	  player->Pushing = TRUE;
+	}
+      }
     }
   }
 }
 
-void SiebAktivieren(int x, int y)
+void GameActions(int player_action)
 {
-  CheckExploding=TRUE;
+  static long action_delay = 0;
+  long action_delay_value;
+  int sieb_x = 0, sieb_y = 0;
+  int i, x,y, element;
 
-  if (SiebAktiv>1)
-  {
-    if (SiebAktiv%2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_SIEB_VOLL+3-(SiebAktiv%8)/2);
+  if (game_status != PLAYING)
+    return;
 
-/*
-    if (!(SiebAktiv%4))
-      PlaySoundLevel(x,y,SND_MIEP);
-*/
+#ifdef DEBUG
+  action_delay_value =
+    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GameFrameDelay);
+#else
+  action_delay_value =
+    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GAME_FRAME_DELAY);
+#endif
 
-  }
-  else
+  /* main game synchronization point */
+  WaitUntilDelayReached(&action_delay, action_delay_value);
+
+  for(i=0; i<MAX_PLAYERS; i++)
   {
-    Feld[x][y] = EL_SIEB_TOT;
-    DrawLevelField(x,y);
+    player = &stored_player[i];
+    JX = player->JX;
+    JY = player->JY;
+    lastJX = player->lastJX;
+    lastJY = player->lastJY;
+
+    if (!player->active)
+      continue;
+
+    PlayerActions(player_action);
+
+    if (player->MovPos)
+      ScrollFigure(0);
   }
-}
 
-void AusgangstuerPruefen(int x, int y)
-{
-  CheckExploding=TRUE;
+  player = local_player;
+  JX = player->JX;
+  JY = player->JY;
+  lastJX = player->lastJX;
+  lastJY = player->lastJY;
 
-  if (!Gems)
-    Feld[x][y] = EL_AUSGANG_ACT;
-}
+  if (tape.pausing || (tape.playing && !TapePlayDelay()))
+    return;
+  else if (tape.recording)
+    TapeRecordDelay();
 
-void AusgangstuerOeffnen(int x, int y)
-{
-  CheckExploding=TRUE;
+  FrameCounter++;
+  TimeFrames++;
 
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 20;
+  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 (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+#if DEBUG
+    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");
+      }
+    }
+#endif
+  }
+
+  for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
   {
-    int tuer;
+    element = Feld[x][y];
 
-    MovDelay[x][y]--;
-    tuer = MovDelay[x][y]/5;
-    if (!(MovDelay[x][y]%5) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AUSGANG_ZU+3-tuer);
+    if (IS_INACTIVE(element))
+      continue;
 
-    if (!MovDelay[x][y])
+    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 (SiebAktiv)
     {
-      Feld[x][y] = EL_AUSGANG_AUF;
-      DrawLevelField(x,y);
+      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;
+      }
+
+      if (sieb && ABS(x-JX)+ABS(y-JY) < ABS(sieb_x-JX)+ABS(sieb_y-JY))
+      {
+	sieb_x = x;
+	sieb_y = y;
+      }
     }
   }
-}
 
-int GameActions(int mx, int my, int button)
-{
-  static long time_delay=0, action_delay=0;
-  int Action;
+  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++)
+      {
+	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);
+	}
+      }
+    }
+  }
 
-  if (TimeLeft>0 && DelayReached(&time_delay,100) && !tape.pausing)
+  if (TimeLeft>0 && TimeFrames>=(1000/GameFrameDelay) && !tape.pausing)
   {
+    TimeFrames = 0;
     TimeLeft--;
 
     if (tape.recording || tape.playing)
@@ -2184,114 +2917,84 @@ int GameActions(int mx, int my, int button)
       PlaySoundStereo(SND_GONG,PSND_MAX_RIGHT);
 
     DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
-    BackToFront();
+
+    if (!TimeLeft)
+      KillHero();
   }
 
-  if (!TimeLeft)
-    KillHero();
 
-  Action = (CheckMoving || CheckExploding || SiebAktiv);
 
-/*
-  if (Action && DelayReached(&action_delay,3))
-*/
 
-  if (DelayReached(&action_delay,3))
+  for(i=0; i<MAX_PLAYERS; i++)
   {
-    int x,y,element;
-
-    if (tape.pausing || (tape.playing && !TapePlayDelay()))
-      return(ACT_GO_ON);
-    else if (tape.recording)
-      TapeRecordDelay();
-
-    CheckMoving = CheckExploding = FALSE;
-    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
-      Stop[x][y] = FALSE;
-
-    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
-    {
-      element = Feld[x][y];
-
-      if (element==EL_LEERRAUM || element==EL_ERDREICH)
-	continue;
-
-      if (!IS_MOVING(x,y) && (CAN_FALL(element) || CAN_MOVE(element)))
-	StartMoving(x,y);
-      else if (IS_MOVING(x,y))
-	ContinueMoving(x,y);
-      else if (element==EL_DYNAMIT)
-	CheckDynamite(x,y);
-      else if (element==EL_EXPLODING)
-	Explode(x,y,Frame[x][y]);
-      else if (element==EL_AMOEBING2 || element==EL_AMOEBING3)
-	AmoebeWaechst(x,y);
-      else if (element==EL_AMOEBE2 || element==EL_AMOEBE3)
-	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);
-
-      if (SiebAktiv && (element==EL_SIEB_LEER ||
-			element==EL_SIEB_VOLL ||
-			Store[x][y]==EL_SIEB_LEER))
-	SiebAktivieren(x,y);
-    }
+    player = &stored_player[i];
+    JX = player->JX;
+    JY = player->JY;
+    lastJX = player->lastJX;
+    lastJY = player->lastJY;
 
-    if (SiebAktiv)
-      SiebAktiv--;
+    if (!player->active)
+      continue;
 
-    if (CheckMoving || CheckExploding)
-      BackToFront();
+    DrawPlayerField(player->JX,player->JY);
   }
 
-  return(ACT_GO_ON);
+  player = local_player;
+  JX = player->JX;
+  JY = player->JY;
+  lastJX = player->lastJX;
+  lastJY = player->lastJY;
+
+  /*
+  DrawPlayerField(JX,JY);
+  */
 }
 
 void ScrollLevel(int dx, int dy)
 {
+  int softscroll_offset = (soft_scrolling_on ? TILEX : 0);
   int x,y;
 
+  ScreenMovPos = player->GfxPos;
+
   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_FIELDY;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)
+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;
 
-  if (!dx && !dy)
+  if (PlayerGone || (!dx && !dy))
     return(MF_NO_ACTION);
+
+  player->MovDir = (dx < 0 ? MV_LEFT :
+		    dx > 0 ? MV_RIGHT :
+		    dy < 0 ? MV_UP :
+		    dy > 0 ? MV_DOWN :	MV_NO_MOVING);
+
   if (!IN_LEV_FIELD(newJX,newJY))
     return(MF_NO_ACTION);
 
@@ -2306,11 +3009,7 @@ BOOL MoveFigureOneStep(int dx, int dy)
       InitMovingField(JX,JY,MV_DOWN);
       Store[JX][JY] = EL_SALZSAEURE;
       ContinueMoving(JX,JY);
-
-      PlaySoundLevel(JX,JY,SND_AUTSCH);
-      PlaySoundLevel(JX,JY,SND_LACHEN);
-      GameOver=TRUE;
-      JX=JY=-1;
+      BuryHero();
     }
     else
       KillHero();
@@ -2318,85 +3017,143 @@ BOOL MoveFigureOneStep(int dx, int dy)
     return(MF_MOVING);
   }
 
-  can_move = DigField(newJX,newJY,DF_DIG);
+  can_move = DigField(newJX,newJY, real_dx,real_dy, DF_DIG);
   if (can_move != MF_MOVING)
     return(can_move);
 
-  oldJX = JX;
-  oldJY = JY;
-  JX = newJX;
-  JY = newJY;
+  lastJX = player->lastJX = JX;
+  lastJY = player->lastJY = JY;
+  JX = player->JX = newJX;
+  JY = player->JY = newJY;
 
-  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);
+  StorePlayer[lastJX][lastJY] = EL_LEERRAUM;
+  StorePlayer[JX][JY] = EL_SPIELER1;
+
+  player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * 7*TILEX/8;
+
+  ScrollFigure(-1);
 
   return(MF_MOVING);
 }
 
 BOOL MoveFigure(int dx, int dy)
 {
-  static long move_delay = 0;
   int moved = MF_NO_ACTION;
+  int oldJX = JX, oldJY = JY;
 
-  if (GameOver || (!dx && !dy))
+  if (PlayerGone || (!dx && !dy))
     return(FALSE);
 
-  if (!DelayReached(&move_delay,10) && !tape.playing)
+  if (!FrameReached(&player->move_delay,MoveSpeed) && !tape.playing)
     return(FALSE);
 
-  if (moved |= MoveFigureOneStep(dx,0))
-    moved |= MoveFigureOneStep(0,dy);
+  if (player->last_move_dir & (MV_LEFT | MV_RIGHT))
+  {
+    if (!(moved |= MoveFigureOneStep(0,dy, dx,dy)))
+      moved |= MoveFigureOneStep(dx,0, dx,dy);
+  }
   else
   {
-    moved |= MoveFigureOneStep(0,dy);
-    moved |= MoveFigureOneStep(dx,0);
+    if (!(moved |= MoveFigureOneStep(dx,0, dx,dy)))
+      moved |= MoveFigureOneStep(0,dy, dx,dy);
   }
 
-  if (moved & MF_MOVING)
+
+  /*
+  player->last_move_dir = MV_NO_MOVING;
+  */
+
+
+  if (moved & MF_MOVING && player == local_player)
   {
-    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 && JX>=MIDPOSX-1 && JX<=lev_fieldx-MIDPOSX)
-      scroll_x = JX-MIDPOSX;
-    if (scroll_y!=JY-MIDPOSY && JY>=MIDPOSY-1 && JY<=lev_fieldy-MIDPOSY)
-      scroll_y = JY-MIDPOSY;
+    if ((scroll_x < JX-MIDPOSX-offset || scroll_x > JX-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))
+      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 (Feld[JX][JY]==EL_LEERRAUM)
-      DrawLevelElement(JX,JY,EL_SPIELFIGUR);
-    else
-      DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_SPIELFIGUR);
+  if (!(moved & MF_MOVING) && !player->Pushing)
+    player->Frame = 0;
+  else
+    player->Frame = (player->Frame + 1) % 4;
+
+  if (moved & MF_MOVING)
+  {
+    if (oldJX != JX && oldJY == JY)
+      player->MovDir = (oldJX < JX ? MV_RIGHT : MV_LEFT);
+    else if (oldJX == JX && oldJY != JY)
+      player->MovDir = (oldJY < JY ? MV_DOWN : MV_UP);
+
+    DrawLevelField(JX,JY);	/* für "ErdreichAnbroeckeln()" */
+
+    player->last_move_dir = player->MovDir;
   }
 
   TestIfHeroHitsBadThing();
 
-  BackToFront();
-
-  if (LevelSolved)
-    GameWon();
+  if (PlayerGone)
+    RemoveHero();
 
   return(moved);
 }
 
-void TestIfHeroHitsBadThing()
+void ScrollFigure(int init)
+{
+  static long actual_frame_counter = 0;
+
+  if (init)
+  {
+    actual_frame_counter = FrameCounter;
+
+    player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize);
+
+    if (Feld[lastJX][lastJY] == EL_LEERRAUM)
+      Feld[lastJX][lastJY] = EL_PLAYER_IS_LEAVING;
+
+    DrawPlayerField(JX,JY);
+    return;
+  }
+  else if (!FrameReached(&actual_frame_counter,1))
+    return;
+
+  player->MovPos += (player->MovPos > 0 ? -1 : 1) * TILEX/8;
+  player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize);
+
+  if (ScreenMovPos && ScreenMovPos != local_player->GfxPos)
+  {
+    ScreenMovPos = local_player->GfxPos;
+    redraw_mask |= REDRAW_FIELD;
+  }
+
+  if (Feld[lastJX][lastJY] == EL_PLAYER_IS_LEAVING)
+    Feld[lastJX][lastJY] = EL_LEERRAUM;
+
+  DrawPlayerField(JX,JY);
+
+  if (!player->MovPos)
+  {
+    lastJX = JX;
+    lastJY = JY;
+  }
+}
+
+void TestIfGoodThingHitsBadThing(int goodx, int goody)
 {
-  int i, killx = JX,killy = JY;
+  int i, killx = goodx, killy = goody;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
   static int harmless[4] =
   {
@@ -2410,8 +3167,8 @@ void TestIfHeroHitsBadThing()
   {
     int x,y,element;
 
-    x = JX+xy[i][0];
-    y = JY+xy[i][1];
+    x = goodx+xy[i][0];
+    y = goody+xy[i][1];
     if (!IN_LEV_FIELD(x,y))
       continue;
 
@@ -2428,13 +3185,78 @@ void TestIfHeroHitsBadThing()
     }
   }
 
-  if (killx!=JX || killy!=JY)
-    KillHero();
+  if (killx!=goodx || killy!=goody)
+  {
+    if (IS_PLAYER(goodx,goody))
+      KillHero();
+    else
+      Bang(goodx,goody);
+  }
+}
+
+void TestIfBadThingHitsGoodThing(int badx, int bady)
+{
+  int i, killx = badx, killy = bady;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+  static int harmless[4] =
+  {
+    MV_UP,
+    MV_LEFT,
+    MV_RIGHT,
+    MV_DOWN
+  };
+
+  for(i=0;i<4;i++)
+  {
+    int x,y,element;
+
+    x = badx+xy[i][0];
+    y = bady+xy[i][1];
+    if (!IN_LEV_FIELD(x,y))
+      continue;
+
+    element = Feld[x][y];
+
+    if (element==EL_PINGUIN)
+    {
+      if (MovDir[x][y]==harmless[i] && IS_MOVING(x,y))
+	continue;
+
+      killx = x;
+      killy = y;
+      break;
+    }
+  }
+
+  if (killx!=badx || killy!=bady)
+    Bang(killx,killy);
+}
+
+void TestIfHeroHitsBadThing()
+{
+  TestIfGoodThingHitsBadThing(JX,JY);
 }
 
 void TestIfBadThingHitsHero()
 {
-  TestIfHeroHitsBadThing();
+  TestIfGoodThingHitsBadThing(JX,JY);
+  /* (no typo!) */
+}
+
+void TestIfFriendHitsBadThing(int x, int y)
+{
+  TestIfGoodThingHitsBadThing(x,y);
+}
+
+void TestIfBadThingHitsFriend(int x, int y)
+{
+  TestIfBadThingHitsGoodThing(x,y);
 }
 
 void TestIfBadThingHitsOtherBadThing(int badx, int bady)
@@ -2442,10 +3264,10 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady)
   int i, killx=badx, killy=bady;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
   for(i=0;i<4;i++)
@@ -2459,7 +3281,7 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady)
 
     element=Feld[x][y];
     if (IS_AMOEBOID(element) || element==EL_LIFE ||
-	element==EL_AMOEBING2 || element==EL_AMOEBING3 || element==EL_TROPFEN)
+	element==EL_AMOEBING ||	element==EL_TROPFEN)
     {
       killx=x;
       killy=y;
@@ -2473,33 +3295,52 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady)
 
 void KillHero()
 {
-  if (PLAYER(-1,-1))
+  if (PlayerGone)
     return;
 
   if (IS_PFORTE(Feld[JX][JY]))
     Feld[JX][JY] = EL_LEERRAUM;
 
+  Bang(JX,JY);
+  BuryHero();
+}
+
+void BuryHero()
+{
+  if (PlayerGone)
+    return;
+
   PlaySoundLevel(JX,JY,SND_AUTSCH);
   PlaySoundLevel(JX,JY,SND_LACHEN);
-  Bang(JX,JY);
+
   GameOver = TRUE;
+  RemoveHero();
+}
+
+void RemoveHero()
+{
+  PlayerGone = TRUE;
+
+  ExitX = ZX = JX;
+  ExitY = ZY = JY;
   JX = JY = -1;
 }
 
-int DigField(int x, int y, int mode)
+int DigField(int x, int y, int real_dx, int real_dy, int mode)
 {
-  int dx=x-JX, dy=y-JY;
+  int dx = x-JX, dy = y-JY;
   int element;
-  static long push_delay = 0;
-  static int push_delay_value = 20;
 
-  if (mode==DF_NO_PUSH)
+  if (!player->MovPos)
+    player->Pushing = FALSE;
+
+  if (mode == DF_NO_PUSH)
   {
-    push_delay = 0;
+    player->push_delay = 0;
     return(MF_NO_ACTION);
   }
 
-  if (IS_MOVING(x,y))
+  if (IS_MOVING(x,y) || IS_PLAYER(x,y))
     return(MF_NO_ACTION);
 
   element = Feld[x][y];
@@ -2507,39 +3348,72 @@ int DigField(int x, int y, int mode)
   switch(element)
   {
     case EL_LEERRAUM:
-      CheckMoving=TRUE;
       break;
+
     case EL_ERDREICH:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
+      Feld[x][y] = EL_LEERRAUM;
       break;
+
     case EL_EDELSTEIN:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
-      if (Gems>0)
-	Gems--;
-      RaiseScore(level.score[SC_EDELSTEIN]);
-      DrawText(DX_EMERALDS,DY_EMERALDS,int2str(Gems,3),FS_SMALL,FC_YELLOW);
+    case EL_EDELSTEIN_BD:
+    case EL_EDELSTEIN_GELB:
+    case EL_EDELSTEIN_ROT:
+    case EL_EDELSTEIN_LILA:
+      Feld[x][y] = EL_LEERRAUM;
+      MovDelay[x][y] = 0;	/* wegen EDELSTEIN_BD-Funkeln! */
+      if (local_player->gems_still_needed > 0)
+	local_player->gems_still_needed--;
+      RaiseScoreElement(EL_EDELSTEIN);
+      DrawText(DX_EMERALDS, DY_EMERALDS,
+	       int2str(local_player->gems_still_needed, 3),
+	       FS_SMALL, FC_YELLOW);
+      PlaySoundLevel(x, y, SND_PONG);
+      break;
+
+    case EL_DIAMANT:
+      Feld[x][y] = EL_LEERRAUM;
+      local_player->gems_still_needed -= 3;
+      if (local_player->gems_still_needed < 0)
+	local_player->gems_still_needed = 0;
+      RaiseScoreElement(EL_DIAMANT);
+      DrawText(DX_EMERALDS, DY_EMERALDS,
+	       int2str(local_player->gems_still_needed, 3),
+	       FS_SMALL, FC_YELLOW);
+      PlaySoundLevel(x, y, SND_PONG);
+      break;
+
+    case EL_DYNAMIT_AUS:
+      Feld[x][y] = EL_LEERRAUM;
+      player->dynamite++;
+      RaiseScoreElement(EL_DYNAMIT);
+      DrawText(DX_DYNAMITE, DY_DYNAMITE,
+	       int2str(local_player->dynamite, 3),
+	       FS_SMALL, FC_YELLOW);
+      PlaySoundLevel(x,y,SND_PONG);
+      break;
+
+    case EL_DYNABOMB_NR:
+      Feld[x][y] = EL_LEERRAUM;
+      player->dynabomb_count++;
+      player->dynabombs_left++;
+      RaiseScoreElement(EL_DYNAMIT);
       PlaySoundLevel(x,y,SND_PONG);
       break;
-    case EL_DIAMANT:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
-      Gems -= 3;
-      if (Gems<0)
-	Gems=0;
-      RaiseScore(level.score[SC_DIAMANT]);
-      DrawText(DX_EMERALDS,DY_EMERALDS,int2str(Gems,3),FS_SMALL,FC_YELLOW);
+    case EL_DYNABOMB_SZ:
+
+      Feld[x][y] = EL_LEERRAUM;
+      player->dynabomb_size++;
+      RaiseScoreElement(EL_DYNAMIT);
       PlaySoundLevel(x,y,SND_PONG);
       break;
-    case EL_DYNAMIT_AUS:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
-      Dynamite++;
-      RaiseScore(level.score[SC_DYNAMIT]);
-      DrawText(DX_DYNAMITE,DY_DYNAMITE,int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
+
+    case EL_DYNABOMB_XL:
+      Feld[x][y] = EL_LEERRAUM;
+      player->dynabomb_xl = TRUE;
+      RaiseScoreElement(EL_DYNAMIT);
       PlaySoundLevel(x,y,SND_PONG);
       break;
+
     case EL_SCHLUESSEL1:
     case EL_SCHLUESSEL2:
     case EL_SCHLUESSEL3:
@@ -2548,46 +3422,55 @@ int DigField(int x, int y, int mode)
       int key_nr = element-EL_SCHLUESSEL1;
 
       Feld[x][y] = EL_LEERRAUM;
-      CheckMoving = TRUE;
-      Key[key_nr] = TRUE;
-      RaiseScore(level.score[SC_SCHLUESSEL]);
-      DrawMiniGraphicExtHiRes(drawto,gc,
-			      DX_KEYS+key_nr*MINI_TILEX,DY_KEYS,
-			      GFX_SCHLUESSEL1+key_nr);
-      DrawMiniGraphicExtHiRes(window,gc,
-			      DX_KEYS+key_nr*MINI_TILEX,DY_KEYS,
-			      GFX_SCHLUESSEL1+key_nr);
+      player->key[key_nr] = TRUE;
+      RaiseScoreElement(EL_SCHLUESSEL);
+      DrawMiniGraphicExt(drawto,gc,
+			 DX_KEYS+key_nr*MINI_TILEX,DY_KEYS,
+			 GFX_SCHLUESSEL1+key_nr);
+      DrawMiniGraphicExt(window,gc,
+			 DX_KEYS+key_nr*MINI_TILEX,DY_KEYS,
+			 GFX_SCHLUESSEL1+key_nr);
       PlaySoundLevel(x,y,SND_PONG);
       break;
     }
+
     case EL_ABLENK_AUS:
-      Feld[x][y]=EL_ABLENK_EIN;
-      CheckExploding=TRUE;
-      ZX=x;
-      ZY=y;
+      Feld[x][y] = EL_ABLENK_EIN;
+      ZX = x;
+      ZY = y;
       DrawLevelField(x,y);
-/*
-      PlaySoundLevel(x,y,SND_DENG);
-*/
       return(MF_ACTION);
       break;
+
     case EL_FELSBROCKEN:
     case EL_BOMBE:
     case EL_KOKOSNUSS:
-      if (mode==DF_SNAP)
+    case EL_ZEIT_LEER:
+      if (dy || mode==DF_SNAP)
 	return(MF_NO_ACTION);
-      if (dy || !IN_LEV_FIELD(x+dx,y+dy) || Feld[x+dx][y+dy]!=EL_LEERRAUM)
+
+      player->Pushing = TRUE;
+
+      if (!IN_LEV_FIELD(x+dx,y+dy) || Feld[x+dx][y+dy] != EL_LEERRAUM)
 	return(MF_NO_ACTION);
 
-      if (Counter() > push_delay+4*push_delay_value)
-	push_delay = Counter();
-      if (!DelayReached(&push_delay,push_delay_value) && !tape.playing)
+      if (real_dy)
+      {
+	if (IN_LEV_FIELD(JX,JY+real_dy) && !IS_SOLID(Feld[JX][JY+real_dy]))
+	  return(MF_NO_ACTION);
+      }
+
+      if (player->push_delay == 0)
+	player->push_delay = FrameCounter;
+      if (!FrameReached(&player->push_delay, player->push_delay_value) &&
+	  !tape.playing)
 	return(MF_NO_ACTION);
 
       Feld[x][y] = EL_LEERRAUM;
       Feld[x+dx][y+dy] = element;
-      push_delay_value = 10+RND(30);
-      CheckMoving = TRUE;
+
+      player->push_delay_value = 2+RND(8);
+
       DrawLevelField(x+dx,y+dy);
       if (element==EL_FELSBROCKEN)
 	PlaySoundLevel(x+dx,y+dy,SND_PUSCH);
@@ -2596,36 +3479,147 @@ int DigField(int x, int y, int mode)
       else
 	PlaySoundLevel(x+dx,y+dy,SND_KLOPF);
       break;
+
     case EL_PFORTE1:
     case EL_PFORTE2:
     case EL_PFORTE3:
     case EL_PFORTE4:
-      if (!Key[element-EL_PFORTE1])
+      if (!player->key[element-EL_PFORTE1])
 	return(MF_NO_ACTION);
       break;
+
     case EL_PFORTE1X:
     case EL_PFORTE2X:
     case EL_PFORTE3X:
     case EL_PFORTE4X:
-      if (!Key[element-EL_PFORTE1X])
+      if (!player->key[element-EL_PFORTE1X])
 	return(MF_NO_ACTION);
       break;
+
     case EL_AUSGANG_ZU:
     case EL_AUSGANG_ACT:
       /* Tür ist (noch) nicht offen! */
       return(MF_NO_ACTION);
       break;
+
     case EL_AUSGANG_AUF:
-      if (mode==DF_SNAP || Gems>0)
+      if (mode==DF_SNAP)
 	return(MF_NO_ACTION);
-      LevelSolved = TRUE;
+
+      PlayerGone = TRUE;
       PlaySoundLevel(x,y,SND_BUING);
+
+      if (!local_player->friends_still_needed)
+	LevelSolved = GameOver = TRUE;
+
+      break;
+
+    case EL_BIRNE_AUS:
+      Feld[x][y] = EL_BIRNE_EIN;
+      local_player->lights_still_needed--;
+      DrawLevelField(x,y);
+      PlaySoundLevel(x,y,SND_DENG);
+      return(MF_ACTION);
+      break;
+
+    case EL_ZEIT_VOLL:
+      Feld[x][y] = EL_ZEIT_LEER;
+      TimeLeft += 10;
+      DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
+      DrawLevelField(x,y);
+      PlaySoundStereo(SND_GONG,PSND_MAX_RIGHT);
+      return(MF_ACTION);
+      break;
+
+    case EL_SOKOBAN_FELD_LEER:
+      break;
+
+    case EL_SOKOBAN_FELD_VOLL:
+    case EL_SOKOBAN_OBJEKT:
+    case EL_SONDE:
+      if (mode==DF_SNAP)
+	return(MF_NO_ACTION);
+
+      player->Pushing = TRUE;
+
+      if (!IN_LEV_FIELD(x+dx,y+dy)
+	  || (Feld[x+dx][y+dy] != EL_LEERRAUM
+	      && (Feld[x+dx][y+dy] != EL_SOKOBAN_FELD_LEER
+		  || !IS_SB_ELEMENT(element))))
+	return(MF_NO_ACTION);
+
+      if (dx && real_dy)
+      {
+	if (IN_LEV_FIELD(JX,JY+real_dy) && !IS_SOLID(Feld[JX][JY+real_dy]))
+	  return(MF_NO_ACTION);
+      }
+      else if (dy && real_dx)
+      {
+	if (IN_LEV_FIELD(JX+real_dx,JY) && !IS_SOLID(Feld[JX+real_dx][JY]))
+	  return(MF_NO_ACTION);
+      }
+
+      if (player->push_delay == 0)
+	player->push_delay = FrameCounter;
+      if (!FrameReached(&player->push_delay, player->push_delay_value) &&
+	  !tape.playing)
+	return(MF_NO_ACTION);
+
+      if (IS_SB_ELEMENT(element))
+      {
+	if (element == EL_SOKOBAN_FELD_VOLL)
+	{
+	  Feld[x][y] = EL_SOKOBAN_FELD_LEER;
+	  local_player->sokobanfields_still_needed++;
+	}
+	else
+	  Feld[x][y] = EL_LEERRAUM;
+
+	if (Feld[x+dx][y+dy] == EL_SOKOBAN_FELD_LEER)
+	{
+	  Feld[x+dx][y+dy] = EL_SOKOBAN_FELD_VOLL;
+	  local_player->sokobanfields_still_needed--;
+	  if (element == EL_SOKOBAN_OBJEKT)
+	    PlaySoundLevel(x,y,SND_DENG);
+	}
+	else
+	  Feld[x+dx][y+dy] = EL_SOKOBAN_OBJEKT;
+      }
+      else
+      {
+	Feld[x][y] = EL_LEERRAUM;
+	Feld[x+dx][y+dy] = element;
+      }
+
+      player->push_delay_value = 2;
+
+      DrawLevelField(x,y);
+      DrawLevelField(x+dx,y+dy);
+      PlaySoundLevel(x+dx,y+dy,SND_PUSCH);
+
+      if (IS_SB_ELEMENT(element) &&
+	  local_player->sokobanfields_still_needed == 0 &&
+	  game_emulation == EMU_SOKOBAN)
+      {
+	LevelSolved = GameOver = TRUE;
+	PlaySoundLevel(x,y,SND_BUING);
+      }
+
       break;
+
+    case EL_MAULWURF:
+    case EL_PINGUIN:
+    case EL_SCHWEIN:
+    case EL_DRACHE:
+      break;
+
     default:
       return(MF_NO_ACTION);
       break;
   }
-  push_delay=0;
+
+  player->push_delay = 0;
+
   return(MF_MOVING);
 }
 
@@ -2634,7 +3628,7 @@ BOOL SnapField(int dx, int dy)
   int x = JX+dx, y = JY+dy;
   static int snapped = FALSE;
 
-  if (GameOver || !IN_LEV_FIELD(x,y))
+  if (PlayerGone || !IN_LEV_FIELD(x,y))
     return(FALSE);
   if (dx && dy)
     return(FALSE);
@@ -2646,7 +3640,12 @@ BOOL SnapField(int dx, int dy)
   if (snapped)
     return(FALSE);
 
-  if (!DigField(x,y,DF_SNAP))
+  player->MovDir = (dx < 0 ? MV_LEFT :
+		    dx > 0 ? MV_RIGHT :
+		    dy < 0 ? MV_UP :
+		    dy > 0 ? MV_DOWN :	MV_NO_MOVING);
+
+  if (!DigField(x,y, 0,0, DF_SNAP))
     return(FALSE);
 
   snapped = TRUE;
@@ -2658,17 +3657,37 @@ BOOL SnapField(int dx, int dy)
 
 BOOL PlaceBomb(void)
 {
-  if (Dynamite==0 || Feld[JX][JY]==EL_DYNAMIT)
+  int element;
+
+  if (PlayerGone || player->MovPos)
     return(FALSE);
 
-  if (Feld[JX][JY]!=EL_LEERRAUM)
-    Store[JX][JY] = Feld[JX][JY];
-  Feld[JX][JY] = EL_DYNAMIT;
-  MovDelay[JX][JY] = 48;
-  Dynamite--;
-  DrawText(DX_DYNAMITE,DY_DYNAMITE,int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
-  DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNAMIT);
-  CheckExploding = TRUE;
+  element = Feld[JX][JY];
+
+  if ((player->dynamite==0 && player->dynabombs_left==0) ||
+      element==EL_DYNAMIT || element==EL_DYNABOMB || element==EL_EXPLODING)
+    return(FALSE);
+
+  if (element != EL_LEERRAUM)
+    Store[JX][JY] = element;
+
+  if (player->dynamite)
+  {
+    Feld[JX][JY] = EL_DYNAMIT;
+    MovDelay[JX][JY] = 96;
+    player->dynamite--;
+    DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3),
+	     FS_SMALL, FC_YELLOW);
+    DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNAMIT);
+  }
+  else
+  {
+    Feld[JX][JY] = EL_DYNABOMB;
+    MovDelay[JX][JY] = 96;
+    player->dynabombs_left--;
+    DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNABOMB);
+  }
+
   return(TRUE);
 }
 
@@ -2676,22 +3695,32 @@ void PlaySoundLevel(int x, int y, int sound_nr)
 {
   int sx = SCROLLX(x), sy = SCROLLY(y);
   int volume, stereo;
+  int silence_distance = 8;
 
-  if (!sound_loops_on && IS_LOOP_SOUND(sound_nr))
+  if ((!sound_simple_on && !IS_LOOP_SOUND(sound_nr)) ||
+      (!sound_loops_on && IS_LOOP_SOUND(sound_nr)))
     return;
 
-  if (!IN_LEV_FIELD(x,y))
+  if (!IN_LEV_FIELD(x,y) ||
+      sx < -silence_distance || sx >= SCR_FIELDX+silence_distance ||
+      sy < -silence_distance || sy >= SCR_FIELDY+silence_distance)
     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))
   {
-    if (sx<0 || sx>=SCR_FIELDX)
-      volume = PSND_MAX_VOLUME - 2*ABS(sx-SCR_FIELDX/2);
-    else
-      volume = PSND_MAX_VOLUME - 2*ABS(sy-SCR_FIELDY/2);
+    int dx = ABS(sx-SCR_FIELDX/2)-SCR_FIELDX/2;
+    int dy = ABS(sy-SCR_FIELDY/2)-SCR_FIELDY/2;
+
+    volume -= volume*(dx > dy ? dx : dy)/silence_distance;
   }
 
   PlaySoundExt(sound_nr, volume, stereo, PSND_NO_LOOP);
@@ -2699,400 +3728,49 @@ void PlaySoundLevel(int x, int y, int sound_nr)
 
 void RaiseScore(int value)
 {
-  Score += value;
-  DrawText(DX_SCORE,DY_SCORE,int2str(Score,5),FS_SMALL,FC_YELLOW);
-  BackToFront();
-}
-
-void TapeInitRecording()
-{
-  time_t zeit1 = time(NULL);
-  struct tm *zeit2 = localtime(&zeit1);
-
-  if (tape.recording || tape.playing)
-    return;
-
-  tape.level_nr = level_nr;
-  tape.recording = TRUE;
-  tape.pausing = TRUE;
-  tape.date =
-    10000*(zeit2->tm_year%100) + 100*zeit2->tm_mon + zeit2->tm_mday;
-
-  DrawVideoDisplay(VIDEO_STATE_REC_ON | VIDEO_STATE_PAUSE_ON,0);
-  DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-  DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
-}
-
-void TapeStartRecording()
-{
-  tape.length = 0;
-  tape.counter = 0;
-  tape.pos[tape.counter].delay = 0;
-  tape.recording = TRUE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
-  tape.random_seed = InitRND(NEW_RANDOMIZE);
-  DrawVideoDisplay(VIDEO_STATE_REC_ON | VIDEO_STATE_PAUSE_OFF,0);
-}
-
-void TapeStopRecording()
-{
-  if (!tape.recording)
-    return;
-
-  tape.length = tape.counter;
-  tape.recording = FALSE;
-  tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_REC_OFF,0);
-
-  master_tape = tape;
-}
-
-void TapeRecordAction(int joy)
-{
-  if (!tape.recording || tape.pausing)
-    return;
-
-  if (tape.counter>=MAX_TAPELEN-1)
-  {
-    TapeStopRecording();
-    return;
-  }
-
-  if (joy)
-  {
-    tape.pos[tape.counter].joystickdata = joy;
-    tape.counter++;
-    tape.pos[tape.counter].delay = 0;
-  }
-}
-
-void TapeRecordDelay()
-{
-  if (!tape.recording || tape.pausing)
-    return;
-
-  if (tape.counter>=MAX_TAPELEN)
-  {
-    TapeStopRecording();
-    return;
-  }
-
-  tape.pos[tape.counter].delay++;
-
-  if (tape.pos[tape.counter].delay>=255)
-  {
-    tape.pos[tape.counter].joystickdata = 0;
-    tape.counter++;
-    tape.pos[tape.counter].delay = 0;
-  }
-}
-
-void TapeTogglePause()
-{
-  if (!tape.recording && !tape.playing)
-    return;
-
-  if (tape.pausing)
-  {
-    tape.pausing = FALSE;
-    DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
-    if (game_status==MAINMENU)
-      HandleMainMenu(SX+16,SY+7*32+16,0,0,MB_MENU_CHOICE);
-  }
-  else
-  {
-    tape.pausing = TRUE;
-    DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0);
-  }
-}
-
-void TapeInitPlaying()
-{
-  if (tape.recording || tape.playing || TAPE_IS_EMPTY(tape))
-    return;
-
-  tape.playing = TRUE;
-  tape.pausing = TRUE;
-  DrawVideoDisplay(VIDEO_STATE_PLAY_ON | VIDEO_STATE_PAUSE_ON,0);
-  DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-  DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
-}
-
-void TapeStartPlaying()
-{
-  tape = master_tape;
-
-  tape.counter = 0;
-  tape.recording = FALSE;
-  tape.playing = TRUE;
-  tape.pausing = FALSE;
-  InitRND(tape.random_seed);
-  DrawVideoDisplay(VIDEO_STATE_PLAY_ON | VIDEO_STATE_PAUSE_OFF,0);
-}
-
-void TapeStopPlaying()
-{
-  if (!tape.playing)
-    return;
-
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF,0);
-}
-
-int TapePlayAction()
-{
-  if (!tape.playing || tape.pausing)
-    return(0);
-
-  if (tape.counter>=tape.length)
-  {
-    TapeStopPlaying();
-    return(0);
-  }
-
-  if (!tape.pos[tape.counter].delay)
-  {
-    tape.counter++;
-    return(tape.pos[tape.counter-1].joystickdata);
-  }
-  else
-    return(0);
-}
-
-BOOL TapePlayDelay()
-{
-  if (!tape.playing || tape.pausing)
-    return(0);
-
-  if (tape.counter>=tape.length)
-  {
-    TapeStopPlaying();
-    return(TRUE);
-  }
-
-  if (tape.pos[tape.counter].delay)
-  {
-    tape.pos[tape.counter].delay--;
-    return(TRUE);
-  }
-  else
-    return(FALSE);
+  local_player->score += value;
+  DrawText(DX_SCORE, DY_SCORE, int2str(local_player->score, 5),
+	   FS_SMALL, FC_YELLOW);
 }
 
-void TapeStop()
+void RaiseScoreElement(int element)
 {
-  TapeStopRecording();
-  TapeStopPlaying();
-  DrawVideoDisplay(VIDEO_ALL_OFF,0);
-  if (tape.date && tape.length)
+  switch(element)
   {
-    DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-    DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
+    case EL_EDELSTEIN:
+      RaiseScore(level.score[SC_EDELSTEIN]);
+      break;
+    case EL_DIAMANT:
+      RaiseScore(level.score[SC_DIAMANT]);
+      break;
+    case EL_KAEFER:
+    case EL_BUTTERFLY:
+      RaiseScore(level.score[SC_KAEFER]);
+      break;
+    case EL_FLIEGER:
+    case EL_FIREFLY:
+      RaiseScore(level.score[SC_FLIEGER]);
+      break;
+    case EL_MAMPFER:
+    case EL_MAMPFER2:
+      RaiseScore(level.score[SC_MAMPFER]);
+      break;
+    case EL_ROBOT:
+      RaiseScore(level.score[SC_ROBOT]);
+      break;
+    case EL_PACMAN:
+      RaiseScore(level.score[SC_PACMAN]);
+      break;
+    case EL_KOKOSNUSS:
+      RaiseScore(level.score[SC_KOKOSNUSS]);
+      break;
+    case EL_DYNAMIT:
+      RaiseScore(level.score[SC_DYNAMIT]);
+      break;
+    case EL_SCHLUESSEL:
+      RaiseScore(level.score[SC_SCHLUESSEL]);
+      break;
+    default:
+      break;
   }
 }
-
-void TapeErase()
-{
-  tape.length = 0;
-}
-
-void DrawVideoDisplay(unsigned long state, unsigned long value)
-{
-  int i;
-  int part1 = 0, part2 = 1;
-  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
-  static char *monatsname[12] =
-  {
-    "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
-    "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
-  };
-  static int video_pos[10][2][4] =
-  {
-    VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
-    VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE,
-    VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
-    VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE,
-
-    VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
-    VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE,
-    VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
-    VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE,
-
-    VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
-    VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE,
-    VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
-    VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE,
-
-    VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
-    VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE,
-    VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
-    VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE,
-
-    0,0,
-    0,0,
-    VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
-    VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE,
-
-    VIDEO_BUTTON_PLAY_XPOS, VIDEO_BUTTON_ANY_YPOS,
-    VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE,
-    0,0,
-    0,0,
-
-    VIDEO_BUTTON_REC_XPOS, VIDEO_BUTTON_ANY_YPOS,
-    VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE,
-    0,0,
-    0,0,
-
-    VIDEO_BUTTON_PAUSE_XPOS, VIDEO_BUTTON_ANY_YPOS,
-    VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE,
-    0,0,
-    0,0,
-
-    VIDEO_BUTTON_STOP_XPOS, VIDEO_BUTTON_ANY_YPOS,
-    VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE,
-    0,0,
-    0,0,
-
-    VIDEO_BUTTON_EJECT_XPOS, VIDEO_BUTTON_ANY_YPOS,
-    VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE,
-    0,0,
-    0,0
-  };
-
-  for(i=0;i<20;i++)
-  {
-    if (state & (1<<i))
-    {
-      int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
-
-      if (i%2)			/* i ungerade => STATE_ON / PRESS_OFF */
-	cx = DOOR_GFX_PAGEX4;
-      else
-	cx = DOOR_GFX_PAGEX3;	/* i gerade => STATE_OFF / PRESS_ON */
-
-      if (video_pos[pos][part1][0])
-	XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-		  cx + video_pos[pos][part1][xpos],
-		  cy + video_pos[pos][part1][ypos],
-		  video_pos[pos][part1][xsize],
-		  video_pos[pos][part1][ysize],
-		  VX + video_pos[pos][part1][xpos],
-		  VY + video_pos[pos][part1][ypos]);
-      if (video_pos[pos][part2][0])
-	XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-		  cx + video_pos[pos][part2][xpos],
-		  cy + video_pos[pos][part2][ypos],
-		  video_pos[pos][part2][xsize],
-		  video_pos[pos][part2][ysize],
-		  VX + video_pos[pos][part2][xpos],
-		  VY + video_pos[pos][part2][ypos]);
-    }
-  }
-
-  if (state & VIDEO_STATE_DATE_ON)
-  {
-    int tag = value % 100;
-    int monat = (value/100) % 100;
-    int jahr = (value/10000);
-
-    DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS,
-	     int2str(tag,2),FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
-	     monatsname[monat],FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
-	     int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
-  }
-
-  if (state & VIDEO_STATE_TIME_ON)
-  {
-    int min = value / 60;
-    int sec = value % 60;
-
-    DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
-	     int2str(min,2),FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
-	     int2str(sec,2),FS_SMALL,FC_SPECIAL1);
-  }
-
-  if (state & VIDEO_STATE_DATE)
-    redraw_mask |= REDRAW_VIDEO_1;
-  if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
-    redraw_mask |= REDRAW_VIDEO_2;
-  if (state & VIDEO_PRESS)
-    redraw_mask |= REDRAW_VIDEO_3;
-}
-
-void DrawSoundDisplay(unsigned long state)
-{
-  int pos, cx = DOOR_GFX_PAGEX4, cy = 0;
-
-  pos = (state & BUTTON_SOUND_MUSIC ? SOUND_BUTTON_MUSIC_XPOS :
-	 state & BUTTON_SOUND_LOOPS ? SOUND_BUTTON_LOOPS_XPOS :
-	 SOUND_BUTTON_SOUND_XPOS);
-
-  if (state & BUTTON_ON)
-    cy -= SOUND_BUTTON_YSIZE;
-
-  if (state & BUTTON_PRESSED)
-    cx = DOOR_GFX_PAGEX3;
-
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    cx + pos,cy + SOUND_BUTTON_ANY_YPOS,
-	    SOUND_BUTTON_XSIZE,SOUND_BUTTON_YSIZE,
-	    DX + pos,DY + SOUND_BUTTON_ANY_YPOS);
-
-  redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawGameButton(unsigned long state)
-{
-  int pos, cx = DOOR_GFX_PAGEX4, cy = -GAME_BUTTON_YSIZE;
-
-  pos = (state & BUTTON_GAME_STOP ? GAME_BUTTON_STOP_XPOS :
-	 state & BUTTON_GAME_PAUSE ? GAME_BUTTON_PAUSE_XPOS :
-	 GAME_BUTTON_PLAY_XPOS);
-
-  if (state & BUTTON_PRESSED)
-    cx = DOOR_GFX_PAGEX3;
-
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    cx + pos,cy + GAME_BUTTON_ANY_YPOS,
-	    GAME_BUTTON_XSIZE,GAME_BUTTON_YSIZE,
-	    DX + pos,DY + GAME_BUTTON_ANY_YPOS);
-
-  redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawChooseButton(unsigned long state)
-{
-  int pos, cx = DOOR_GFX_PAGEX4, cy = 0;
-
-  pos = (state & BUTTON_OK ? OK_BUTTON_XPOS : NO_BUTTON_XPOS);
-
-  if (state & BUTTON_PRESSED)
-    cx = DOOR_GFX_PAGEX3;
-
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    cx + pos,cy + OK_BUTTON_GFX_YPOS,
-	    OK_BUTTON_XSIZE,OK_BUTTON_YSIZE,
-	    DX + pos,DY + OK_BUTTON_YPOS);
-
-  redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawConfirmButton(unsigned long state)
-{
-  int cx = DOOR_GFX_PAGEX4, cy = 0;
-
-  if (state & BUTTON_PRESSED)
-    cx = DOOR_GFX_PAGEX3;
-
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    cx + CONFIRM_BUTTON_XPOS,cy + CONFIRM_BUTTON_GFX_YPOS,
-	    CONFIRM_BUTTON_XSIZE,CONFIRM_BUTTON_YSIZE,
-	    DX + CONFIRM_BUTTON_XPOS,DY + CONFIRM_BUTTON_YPOS);
-
-  redraw_mask |= REDRAW_DOOR_1;
-}