X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=c95f398b8b51908de424165fdba307b8e0e4a708;hb=5a5342a6ab48037839b783adc4f3304331834a8c;hp=eb11ae1dd3ab48305474d6dde21e2371cf31b088;hpb=234748b5eb0bc4fe29a36fd25a1d25658f53858a;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index eb11ae1d..c95f398b 100644
--- a/src/game.c
+++ b/src/game.c
@@ -89,6 +89,8 @@
 #define DOUBLE_PLAYER_SPEED(p)	(HALVE_MOVE_DELAY((p)->move_delay_value))
 #define HALVE_PLAYER_SPEED(p)	(DOUBLE_MOVE_DELAY((p)->move_delay_value))
 
+#define	INIT_GFX_RANDOM()	(SimpleRND(1000000))
+
 /* game button identifiers */
 #define GAME_CTRL_ID_STOP		0
 #define GAME_CTRL_ID_PAUSE		1
@@ -99,114 +101,94 @@
 
 #define NUM_GAME_BUTTONS		6
 
+
 /* forward declaration for internal use */
+
+static void InitBeltMovement(void);
 static void CloseAllOpenTimegates(void);
 static void CheckGravityMovement(struct PlayerInfo *);
 static void KillHeroUnlessProtected(int, int);
 
-void PlaySoundLevel(int, int, int);
-void PlaySoundLevelAction(int, int, int);
-void PlaySoundLevelElementAction(int, int, int, int);
+static void PlaySoundLevel(int, int, int);
+static void PlaySoundLevelNearest(int, int, int);
+static void PlaySoundLevelAction(int, int, int);
+static void PlaySoundLevelElementAction(int, int, int, int);
 
 static void MapGameButtons();
 static void HandleGameButtons(struct GadgetInfo *);
 
 static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS];
 
-#define SND_ACTION_UNKNOWN		0
-#define SND_ACTION_WAITING		1
-#define SND_ACTION_MOVING		2
-#define SND_ACTION_DIGGING		3
-#define SND_ACTION_COLLECTING		4
-#define SND_ACTION_PASSING		5
-#define SND_ACTION_IMPACT		6
-#define SND_ACTION_PUSHING		7
-#define SND_ACTION_ACTIVATING		8
-#define SND_ACTION_ACTIVE		9
 
-#define NUM_SND_ACTIONS			10
+/* ------------------------------------------------------------------------- */
+/* definition of elements that automatically change to other elements after  */
+/* a specified time, eventually calling a function when changing             */
+/* ------------------------------------------------------------------------- */
 
-static struct
-{
-  char *text;
-  int value;
-  boolean is_loop;
-} sound_action_properties[] =
+/* forward declaration for changer functions */
+static void InitBuggyBase(int x, int y);
+static void WarnBuggyBase(int x, int y);
+
+static void InitTrap(int x, int y);
+static void ActivateTrap(int x, int y);
+static void ChangeActiveTrap(int x, int y);
+
+static void InitRobotWheel(int x, int y);
+static void RunRobotWheel(int x, int y);
+static void StopRobotWheel(int x, int y);
+
+static void InitTimegateWheel(int x, int y);
+static void RunTimegateWheel(int x, int y);
+
+struct ChangingElementInfo
 {
-  /* insert _all_ loop sound actions here */
-  { ".waiting",		SND_ACTION_WAITING,	TRUE },
-  { ".moving",		SND_ACTION_MOVING,	TRUE }, /* continuos moving */
-  { ".active",		SND_ACTION_ACTIVE,	TRUE },
-  { ".growing",		SND_ACTION_UNKNOWN,	TRUE },
-  { ".attacking",	SND_ACTION_UNKNOWN,	TRUE },
-
-  /* other (non-loop) sound actions are optional */
-  { ".stepping",	SND_ACTION_MOVING,	FALSE }, /* discrete moving */
-  { ".digging",		SND_ACTION_DIGGING,	FALSE },
-  { ".collecting",	SND_ACTION_COLLECTING,	FALSE },
-  { ".passing",		SND_ACTION_PASSING,	FALSE },
-  { ".impact",		SND_ACTION_IMPACT,	FALSE },
-  { ".pushing",		SND_ACTION_PUSHING,	FALSE },
-  { ".activating",	SND_ACTION_ACTIVATING,	FALSE },
-  { NULL,		0,			0 },
+  int base_element;
+  int next_element;
+  int change_delay;
+  void (*pre_change_function)(int x, int y);
+  void (*change_function)(int x, int y);
+  void (*post_change_function)(int x, int y);
 };
-static int element_action_sound[MAX_NUM_ELEMENTS][NUM_SND_ACTIONS];
-static boolean is_loop_sound[NUM_SOUND_FILES];
 
-#define IS_LOOP_SOUND(x)	(is_loop_sound[x])
+static struct ChangingElementInfo changing_element_list[] =
+{
+  { EL_NUT_CRACKING,		EL_EMERALD,		 6, NULL, NULL, NULL },
+  { EL_PEARL_BREAKING,		EL_EMPTY,		 8, NULL, NULL, NULL },
+  { EL_EXIT_OPENING,		EL_EXIT_OPEN,		29, NULL, NULL, NULL },
 
+  { EL_SWITCHGATE_OPENING,	EL_SWITCHGATE_OPEN,	29, NULL, NULL, NULL },
+  { EL_SWITCHGATE_CLOSING,	EL_SWITCHGATE_CLOSED,	29, NULL, NULL, NULL },
 
-#ifdef DEBUG
-#if 0
-static unsigned int getStateCheckSum(int counter)
-{
-  int x, y;
-  unsigned int mult = 1;
-  unsigned int checksum = 0;
-  /*
-  static short lastFeld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-  */
-  static boolean first_game = TRUE;
+  { EL_TIMEGATE_OPENING,	EL_TIMEGATE_OPEN,	29, NULL, NULL, NULL },
+  { EL_TIMEGATE_CLOSING,	EL_TIMEGATE_CLOSED,	29, NULL, NULL, NULL },
 
-  for (y=0; y<lev_fieldy; y++) for(x=0; x<lev_fieldx; x++)
-  {
-    /*
-    if (counter == 3)
-    {
-      if (first_game)
-	lastFeld[x][y] = Feld[x][y];
-      else if (lastFeld[x][y] != Feld[x][y])
-	printf("DIFF: [%d][%d]: lastFeld == %d != %d == Feld\n",
-	       x, y, lastFeld[x][y], Feld[x][y]);
-    }
-    */
+  { EL_ACID_SPLASH_LEFT,	EL_EMPTY,		 8, NULL, NULL, NULL },
+  { EL_ACID_SPLASH_RIGHT,	EL_EMPTY,		 8, NULL, NULL, NULL },
 
-    checksum += mult++ * Ur[x][y];
-    checksum += mult++ * Feld[x][y];
+  { EL_SP_BUGGY_BASE,		EL_SP_BUGGY_BASE_ACTIVATING, 0,
+    InitBuggyBase, NULL, NULL },
+  { EL_SP_BUGGY_BASE_ACTIVATING,EL_SP_BUGGY_BASE_ACTIVE, 0,
+    InitBuggyBase, NULL, NULL },
+  { EL_SP_BUGGY_BASE_ACTIVE,	EL_SP_BUGGY_BASE,	 0,
+    InitBuggyBase, WarnBuggyBase, NULL },
 
-    /*
-    checksum += mult++ * MovPos[x][y];
-    checksum += mult++ * MovDir[x][y];
-    checksum += mult++ * MovDelay[x][y];
-    checksum += mult++ * Store[x][y];
-    checksum += mult++ * Store2[x][y];
-    checksum += mult++ * StorePlayer[x][y];
-    checksum += mult++ * Frame[x][y];
-    checksum += mult++ * AmoebaNr[x][y];
-    checksum += mult++ * JustStopped[x][y];
-    checksum += mult++ * Stop[x][y];
-    */
-  }
+  { EL_TRAP,			EL_TRAP_ACTIVE,		 0,
+    InitTrap, NULL, ActivateTrap },
+  { EL_TRAP_ACTIVE,		EL_TRAP,		31,
+    NULL, ChangeActiveTrap, NULL },
 
-  if (counter == 3 && first_game)
-    first_game = FALSE;
+  { EL_ROBOT_WHEEL_ACTIVE,	EL_ROBOT_WHEEL,		 0,
+    InitRobotWheel, RunRobotWheel, StopRobotWheel },
 
-  return checksum;
-}
-#endif
-#endif
+  { EL_TIMEGATE_SWITCH_ACTIVE,	EL_TIMEGATE_SWITCH,	 0,
+    InitTimegateWheel, RunTimegateWheel, NULL },
+
+  { EL_UNDEFINED,		EL_UNDEFINED,	        -1, NULL	}
+};
 
+static struct ChangingElementInfo changing_element[MAX_NUM_ELEMENTS];
 
+#define IS_AUTO_CHANGING(e)  (changing_element[e].base_element != EL_UNDEFINED)
 
 
 void GetPlayerConfig()
@@ -292,6 +274,12 @@ static void InitField(int x, int y, boolean init_game)
 	  Feld[x][y] = EL_SP_MURPHY_CLONE;
 	  break;
 	}
+	else
+	{
+	  stored_player[0].use_murphy_graphic = TRUE;
+	}
+
+	Feld[x][y] = EL_PLAYER1;
       }
       /* no break! */
     case EL_PLAYER1:
@@ -485,106 +473,16 @@ void DrawGameDoorValues()
     for (j=0; j<4; j++)
       if (stored_player[i].key[j])
 	DrawMiniGraphicExt(drawto, DX_KEYS + j * MINI_TILEX, DY_KEYS,
-			   GFX_SCHLUESSEL1 + j);
+			   el2edimg(EL_KEY1 + j));
 
   DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
-	   int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW);
+	   int2str(local_player->gems_still_needed, 3), FONT_TEXT_2);
   DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
-	   int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
+	   int2str(local_player->dynamite, 3), FONT_TEXT_2);
   DrawText(DX + XX_SCORE, DY + YY_SCORE,
-	   int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
+	   int2str(local_player->score, 5), FONT_TEXT_2);
   DrawText(DX + XX_TIME, DY + YY_TIME,
-	   int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
-}
-
-
-/*
-  =============================================================================
-  InitGameSound()
-  -----------------------------------------------------------------------------
-  initialize sound effect lookup table for element actions
-  =============================================================================
-*/
-
-void InitGameSound()
-{
-  int sound_effect_properties[NUM_SOUND_FILES];
-  int i, j;
-
-#if 0
-  debug_print_timestamp(0, NULL);
-#endif
-
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
-    for (j=0; j<NUM_SND_ACTIONS; j++)
-      element_action_sound[i][j] = -1;
-
-  for (i=0; i<NUM_SOUND_FILES; i++)
-  {
-    int len_effect_text = strlen(sound_files[i].token);
-
-    sound_effect_properties[i] = SND_ACTION_UNKNOWN;
-    is_loop_sound[i] = FALSE;
-
-    /* determine all loop sounds and identify certain sound classes */
-
-    for (j=0; sound_action_properties[j].text; j++)
-    {
-      int len_action_text = strlen(sound_action_properties[j].text);
-
-      if (len_action_text < len_effect_text &&
-	  strcmp(&sound_files[i].token[len_effect_text - len_action_text],
-		 sound_action_properties[j].text) == 0)
-      {
-	sound_effect_properties[i] = sound_action_properties[j].value;
-
-	if (sound_action_properties[j].is_loop)
-	  is_loop_sound[i] = TRUE;
-      }
-    }
-
-    /* associate elements and some selected sound actions */
-
-    for (j=0; j<MAX_NUM_ELEMENTS; j++)
-    {
-      if (element_info[j].sound_class_name)
-      {
-	int len_class_text = strlen(element_info[j].sound_class_name);
-
-	if (len_class_text + 1 < len_effect_text &&
-	    strncmp(sound_files[i].token,
-		    element_info[j].sound_class_name, len_class_text) == 0 &&
-	    sound_files[i].token[len_class_text] == '.')
-	{
-	  int sound_action_value = sound_effect_properties[i];
-
-	  element_action_sound[j][sound_action_value] = i;
-	}
-      }
-    }
-  }
-
-#if 0
-  debug_print_timestamp(0, "InitGameEngine");
-#endif
-
-#if 0
-  /* TEST ONLY */
-  {
-    int element = EL_SAND;
-    int sound_action = SND_ACTION_DIGGING;
-    int j = 0;
-
-    while (sound_action_properties[j].text)
-    {
-      if (sound_action_properties[j].value == sound_action)
-	printf("element %d, sound action '%s'  == %d\n",
-	       element, sound_action_properties[j].text,
-	       element_action_sound[element][sound_action]);
-      j++;
-    }
-  }
-#endif
+	   int2str(TimeLeft, 3), FONT_TEXT_2);
 }
 
 
@@ -636,18 +534,45 @@ static void InitGameEngine()
     for (i=0; i<ep_em_slippery_wall_num; i++)
     {
       if (level.em_slippery_gems)	/* special EM style gems behaviour */
-	Elementeigenschaften2[ep_em_slippery_wall[i]] |=
+	Properties2[ep_em_slippery_wall[i]] |=
 	  EP_BIT_EM_SLIPPERY_WALL;
       else
-	Elementeigenschaften2[ep_em_slippery_wall[i]] &=
+	Properties2[ep_em_slippery_wall[i]] &=
 	  ~EP_BIT_EM_SLIPPERY_WALL;
     }
 
     /* "EL_WALL_GROWING_ACTIVE" wasn't slippery for EM gems in version 2.0.1 */
     if (level.em_slippery_gems && game.engine_version > VERSION_IDENT(2,0,1))
-      Elementeigenschaften2[EL_WALL_GROWING_ACTIVE] |= EP_BIT_EM_SLIPPERY_WALL;
+      Properties2[EL_WALL_GROWING_ACTIVE] |= EP_BIT_EM_SLIPPERY_WALL;
     else
-      Elementeigenschaften2[EL_WALL_GROWING_ACTIVE] &=~EP_BIT_EM_SLIPPERY_WALL;
+      Properties2[EL_WALL_GROWING_ACTIVE] &=~EP_BIT_EM_SLIPPERY_WALL;
+  }
+
+  /* initialize changing elements information */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    changing_element[i].base_element = EL_UNDEFINED;
+    changing_element[i].next_element = EL_UNDEFINED;
+    changing_element[i].change_delay = -1;
+    changing_element[i].pre_change_function = NULL;
+    changing_element[i].change_function = NULL;
+    changing_element[i].post_change_function = NULL;
+  }
+
+  i = 0;
+  while (changing_element_list[i].base_element != EL_UNDEFINED)
+  {
+    struct ChangingElementInfo *ce = &changing_element_list[i];
+    int element = ce->base_element;
+
+    changing_element[element].base_element         = ce->base_element;
+    changing_element[element].next_element         = ce->next_element;
+    changing_element[element].change_delay         = ce->change_delay;
+    changing_element[element].pre_change_function  = ce->pre_change_function;
+    changing_element[element].change_function      = ce->change_function;
+    changing_element[element].post_change_function = ce->post_change_function;
+
+    i++;
   }
 }
 
@@ -718,13 +643,19 @@ void InitGame()
     player->GfxPos = 0;
     player->Frame = 0;
 
-    player->actual_frame_counter = 0;
+    player->GfxAction = ACTION_DEFAULT;
 
-    player->frame_reset_delay = 0;
+    player->use_murphy_graphic = FALSE;
+    player->use_disk_red_graphic = FALSE;
+
+    player->actual_frame_counter = 0;
 
     player->last_move_dir = MV_NO_MOVING;
     player->is_moving = FALSE;
 
+    player->is_moving = FALSE;
+    player->is_waiting = FALSE;
+
     player->move_delay       = game.initial_move_delay;
     player->move_delay_value = game.initial_move_delay_value;
 
@@ -794,12 +725,15 @@ void InitGame()
       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;
-      GfxAction[x][y] = GFX_ACTION_DEFAULT;
       AmoebaNr[x][y] = 0;
       JustStopped[x][y] = 0;
       Stop[x][y] = FALSE;
+      ExplodePhase[x][y] = 0;
       ExplodeField[x][y] = EX_NO_EXPLOSION;
+
+      GfxFrame[x][y] = 0;
+      GfxAction[x][y] = ACTION_DEFAULT;
+      GfxRandom[x][y] = INIT_GFX_RANDOM();
     }
   }
 
@@ -818,6 +752,8 @@ void InitGame()
     }
   }
 
+  InitBeltMovement();
+
   game.emulation = (emulate_bd ? EMU_BOULDERDASH :
 		    emulate_sb ? EMU_SOKOBAN :
 		    emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
@@ -957,7 +893,6 @@ void InitGame()
 
   DrawLevel();
   DrawAllPlayers();
-  FadeToFront();
 
   /* after drawing the level, correct some elements */
   if (game.timegate_time_left == 0)
@@ -967,21 +902,22 @@ void InitGame()
     BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
 
   redraw_mask |= REDRAW_FROM_BACKBUFFER;
+  FadeToFront();
 
   /* copy default game door content to main double buffer */
-  BlitBitmap(pix[PIX_DOOR], drawto,
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
   if (level_nr < 100)
-    DrawText(DX + XX_LEVEL, DY + YY_LEVEL,
-	     int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
+    DrawText(DX + XX_LEVEL, DY + YY_LEVEL, int2str(level_nr, 2), FONT_TEXT_2);
   else
   {
     DrawTextExt(drawto, DX + XX_EMERALDS, DY + YY_EMERALDS,
-		int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3);
+		int2str(level_nr, 3), FONT_LEVEL_NUMBER, FONT_OPAQUE);
     BlitBitmap(drawto, drawto,
 	       DX + XX_EMERALDS, DY + YY_EMERALDS + 1,
-	       FONT5_XSIZE * 3, FONT5_YSIZE - 1,
+	       getFontWidth(FONT_LEVEL_NUMBER) * 3,
+	       getFontHeight(FONT_LEVEL_NUMBER) - 1,
 	       DX + XX_LEVEL - 1, DY + YY_LEVEL + 1);
   }
 
@@ -996,7 +932,7 @@ void InitGame()
   MapTapeButtons();
 
   /* copy actual game door content to door double buffer for OpenDoor() */
-  BlitBitmap(drawto, pix[PIX_DB_DOOR],
+  BlitBitmap(drawto, bitmap_db_door,
 	     DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
   OpenDoor(DOOR_OPEN_ALL);
@@ -1152,6 +1088,9 @@ void GameWon()
   if (local_player->MovPos)
     return;
 
+  if (tape.playing && tape.auto_play)
+    tape.auto_play_level_solved = TRUE;
+
   local_player->LevelSolved = FALSE;
 
   PlaySoundStereo(SND_GAME_WINNING, SOUND_MAX_RIGHT);
@@ -1172,7 +1111,7 @@ void GameWon()
 	TimeLeft -= 10;
       else
 	TimeLeft--;
-      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2);
       BackToFront();
 
       if (!tape.playing)
@@ -1198,7 +1137,7 @@ void GameWon()
 	TimePlayed += 10;
       else
 	TimePlayed++;
-      DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
+      DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FONT_TEXT_2);
       BackToFront();
 
       if (!tape.playing)
@@ -1209,10 +1148,6 @@ void GameWon()
       StopSound(SND_GAME_LEVELTIME_BONUS);
   }
 
-#if 0
-  FadeSounds();
-#endif
-
   /* Hero disappears */
   DrawLevelField(ExitX, ExitY);
   BackToFront();
@@ -1323,18 +1258,48 @@ int NewHiScore()
   return position;
 }
 
+static void InitPlayerGfxAnimation(struct PlayerInfo *player, int action)
+{
+  if (player->GfxAction != action)
+  {
+    player->GfxAction = action;
+    player->Frame = 0;
+  }
+}
+
+static void ResetRandomAnimationValue(int x, int y)
+{
+  GfxRandom[x][y] = INIT_GFX_RANDOM();
+}
+
+static void ResetGfxAnimation(int x, int y)
+{
+  GfxFrame[x][y] = 0;
+  GfxAction[x][y] = ACTION_DEFAULT;
+}
+
 void InitMovingField(int x, int y, int direction)
 {
+  int element = Feld[x][y];
   int newx = x + (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
   int newy = y + (direction == MV_UP   ? -1 : direction == MV_DOWN  ? +1 : 0);
 
-  MovDir[x][y] = direction;
-  MovDir[newx][newy] = direction;
+  if (!JustStopped[x][y] || direction != MovDir[x][y])
+    ResetGfxAnimation(x, y);
+
+  MovDir[newx][newy] = MovDir[x][y] = direction;
 
   if (Feld[newx][newy] == EL_EMPTY)
     Feld[newx][newy] = EL_BLOCKED;
 
-  GfxAction[x][y] = GFX_ACTION_MOVING;
+  if (direction == MV_DOWN && CAN_FALL(element))
+    GfxAction[x][y] = ACTION_FALLING;
+  else
+    GfxAction[x][y] = ACTION_MOVING;
+
+  GfxFrame[newx][newy] = GfxFrame[x][y];
+  GfxAction[newx][newy] = GfxAction[x][y];
+  GfxRandom[newx][newy] = GfxRandom[x][y];
 }
 
 void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
@@ -1445,7 +1410,7 @@ void RemoveMovingField(int x, int y)
   Feld[newx][newy] = EL_EMPTY;
   MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0;
   MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0;
-  GfxAction[oldx][oldy] = GfxAction[newx][newy] = GFX_ACTION_DEFAULT;
+  GfxAction[oldx][oldy] = GfxAction[newx][newy] = ACTION_DEFAULT;
 
   DrawLevelField(oldx, oldy);
   DrawLevelField(newx, newy);
@@ -1463,43 +1428,42 @@ void DrawDynamite(int x, int y)
   if (Store[x][y])
     DrawGraphic(sx, sy, el2img(Store[x][y]), 0);
 
-  frame = getGraphicAnimationFrame(graphic, 96 - MovDelay[x][y]);
-
-  /*
-  printf("-> %d: %d [%d]\n", graphic, frame, MovDelay[x][y]);
-  */
+  frame = getGraphicAnimationFrame(graphic, GfxFrame[x][y]);
 
+#if 1
+  if (Store[x][y])
+    DrawGraphicThruMask(sx, sy, graphic, frame);
+  else
+    DrawGraphic(sx, sy, graphic, frame);
+#else
   if (game.emulation == EMU_SUPAPLEX)
-    DrawGraphic(sx, sy, IMG_SP_DISK_RED, 0);
+    DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame);
   else if (Store[x][y])
     DrawGraphicThruMask(sx, sy, graphic, frame);
   else
     DrawGraphic(sx, sy, graphic, frame);
+#endif
 }
 
 void CheckDynamite(int x, int y)
 {
-  if (MovDelay[x][y])		/* dynamite is still waiting to explode */
+  if (MovDelay[x][y] != 0)	/* dynamite is still waiting to explode */
   {
     MovDelay[x][y]--;
-    if (MovDelay[x][y])
-    {
-      if (!(MovDelay[x][y] % 6))
-	PlaySoundLevelAction(x, y, SND_ACTION_ACTIVE);
 
-      if (IS_ACTIVE_BOMB(Feld[x][y]))
-      {
-	int delay = (Feld[x][y] == EL_DYNAMITE_ACTIVE ? 12 : 6);
+    if (MovDelay[x][y] != 0)
+    {
+      DrawDynamite(x, y);
 
-	if (!(MovDelay[x][y] % delay))
-	  DrawDynamite(x, y);
-      }
+      /* !!! correct: "PlaySoundLevelActionIfLoop" etc. !!! */
+      PlaySoundLevelAction(x, y, ACTION_ACTIVE);
 
       return;
     }
   }
 
-  if (Feld[x][y] == EL_DYNAMITE_ACTIVE)
+  if (Feld[x][y] == EL_DYNAMITE_ACTIVE ||
+      Feld[x][y] == EL_SP_DISK_RED_ACTIVE)
     StopSound(SND_DYNAMITE_ACTIVE);
   else
     StopSound(SND_DYNABOMB_ACTIVE);
@@ -1551,7 +1515,7 @@ void Explode(int ex, int ey, int phase, int mode)
 	RemoveMovingField(x, y);
       }
 
-      if (IS_MASSIVE(element) || element == EL_FLAMES)
+      if (IS_INDESTRUCTIBLE(element) || element == EL_FLAMES)
 	continue;
 
       if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)))
@@ -1640,7 +1604,7 @@ void Explode(int ex, int ey, int phase, int mode)
       Feld[x][y] = EL_EXPLOSION;
       MovDir[x][y] = MovPos[x][y] = 0;
       AmoebaNr[x][y] = 0;
-      Frame[x][y] = 1;
+      ExplodePhase[x][y] = 1;
       Stop[x][y] = TRUE;
     }
 
@@ -1656,7 +1620,7 @@ void Explode(int ex, int ey, int phase, int mode)
   x = ex;
   y = ey;
 
-  Frame[x][y] = (phase < last_phase ? phase + 1 : 0);
+  ExplodePhase[x][y] = (phase < last_phase ? phase + 1 : 0);
 
   if (phase == first_phase_after_start)
   {
@@ -1700,15 +1664,13 @@ void Explode(int ex, int ey, int phase, int mode)
     if (IS_PLAYER(x, y) && !PLAYERINFO(x,y)->present)
       StorePlayer[x][y] = 0;
   }
-  else if (!(phase % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+  else if (phase >= delay && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
   {
-    int graphic = IMG_EXPLOSION;
-    int frame = (phase / delay - 1);
-
-    if (game.emulation == EMU_SUPAPLEX)
-      graphic = (Store[x][y] == EL_SP_INFOTRON ?
-		 IMG_SP_EXPLOSION_INFOTRON :
-		 IMG_SP_EXPLOSION);
+    int stored = Store[x][y];
+    int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION :
+		   stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON :
+		   IMG_SP_EXPLOSION);
+    int frame = getGraphicAnimationFrame(graphic, phase - delay);
 
     if (phase == delay)
       DrawCrumbledSand(SCREENX(x), SCREENY(y));
@@ -1755,7 +1717,7 @@ void DynaExplode(int ex, int ey)
       int y = ey + j * xy[i % 4][1];
       int element;
 
-      if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(Feld[x][y]))
+      if (!IN_LEV_FIELD(x, y) || IS_INDESTRUCTIBLE(Feld[x][y]))
 	break;
 
       element = Feld[x][y];
@@ -1826,50 +1788,83 @@ void Bang(int x, int y)
   }
 }
 
-void Blurb(int x, int y)
+void SplashAcid(int x, int y)
 {
   int element = Feld[x][y];
 
   if (element != EL_ACID_SPLASH_LEFT &&
-      element != EL_ACID_SPLASH_RIGHT)	/* start */
+      element != EL_ACID_SPLASH_RIGHT)
   {
     PlaySoundLevel(x, y, SND_ACID_SPLASHING);
+
     if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) &&
 	(!IN_LEV_FIELD(x-1, y-1) ||
 	 !CAN_FALL(MovingOrBlocked2Element(x-1, y-1))))
-    {
       Feld[x-1][y] = EL_ACID_SPLASH_LEFT;
-    }
+
     if (IN_LEV_FIELD(x+1, y) && IS_FREE(x+1, y) &&
 	(!IN_LEV_FIELD(x+1, y-1) ||
 	 !CAN_FALL(MovingOrBlocked2Element(x+1, y-1))))
-    {
       Feld[x+1][y] = EL_ACID_SPLASH_RIGHT;
-    }
   }
-  else								/* go on */
+}
+
+static void InitBeltMovement()
+{
+  static int belt_base_element[4] =
+  {
+    EL_CONVEYOR_BELT1_LEFT,
+    EL_CONVEYOR_BELT2_LEFT,
+    EL_CONVEYOR_BELT3_LEFT,
+    EL_CONVEYOR_BELT4_LEFT
+  };
+  static int belt_base_active_element[4] =
   {
-    int graphic = (element == EL_ACID_SPLASH_LEFT ?
-		   IMG_ACID_SPLASH_LEFT :
-		   IMG_ACID_SPLASH_RIGHT);
+    EL_CONVEYOR_BELT1_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT2_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT3_LEFT_ACTIVE,
+    EL_CONVEYOR_BELT4_LEFT_ACTIVE
+  };
 
-    if (!MovDelay[x][y])	/* initialize animation counter */
-      MovDelay[x][y] = 9;
+  int x, y, i, j;
+
+  /* set frame order for belt animation graphic according to belt direction */
+  for (i=0; i<4; i++)
+  {
+    int belt_nr = i;
 
-    if (MovDelay[x][y])		/* continue animation */
+    for (j=0; j<3; j++)
     {
-      MovDelay[x][y]--;
-      if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-      {
-	int frame = getGraphicAnimationFrame(graphic, 8 - MovDelay[x][y]);
+      int element = belt_base_active_element[belt_nr] + j;
+      int graphic = el2img(element);
 
-        DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
-      }
+      if (game.belt_dir[i] == MV_LEFT)
+	graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
+      else
+	graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
+    }
+  }
+
+  for(y=0; y<lev_fieldy; y++)
+  {
+    for(x=0; x<lev_fieldx; x++)
+    {
+      int element = Feld[x][y];
 
-      if (!MovDelay[x][y])
+      for (i=0; i<4; i++)
       {
-	Feld[x][y] = EL_EMPTY;
-	DrawLevelField(x, y);
+	if (IS_BELT(element) && game.belt_dir[i] != MV_NO_MOVING)
+	{
+	  int e_belt_nr = getBeltNrFromBeltElement(element);
+	  int belt_nr = i;
+
+	  if (e_belt_nr == belt_nr)
+	  {
+	    int belt_part = Feld[x][y] - belt_base_element[belt_nr];
+
+	    Feld[x][y] = belt_base_active_element[belt_nr] + belt_part;
+	  }
+	}
       }
     }
   }
@@ -1928,9 +1923,9 @@ static void ToggleBeltSwitch(int x, int y)
     int graphic = el2img(element);
 
     if (belt_dir == MV_LEFT)
-      new_graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
+      graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
     else
-      new_graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
+      graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
   }
 
   for (yy=0; yy<lev_fieldy; yy++)
@@ -2126,22 +2121,28 @@ void Impact(int x, int y)
       return;
 
     object_hit = (!IS_FREE(x, y+1) && (!IS_MOVING(x, y+1) ||
-				      MovDir[x][y+1]!=MV_DOWN ||
-				      MovPos[x][y+1]<=TILEY/2));
+				      MovDir[x][y+1] != MV_DOWN ||
+				      MovPos[x][y+1] <= TILEY / 2));
     if (object_hit)
       smashed = MovingOrBlocked2Element(x, y+1);
   }
 
   if (!lastline && smashed == EL_ACID)	/* element falls into acid */
   {
-    Blurb(x, y);
+    SplashAcid(x, y);
     return;
   }
 
+  if (lastline || object_hit)
+  {
+    ResetGfxAnimation(x, y);
+    DrawLevelField(x, y);
+  }
+
   if ((element == EL_BOMB ||
        element == EL_SP_DISK_ORANGE ||
        element == EL_DX_SUPABOMB) &&
-      (lastline || object_hit))	/* element is bomb */
+      (lastline || object_hit))		/* element is bomb */
   {
     Bang(x, y);
     return;
@@ -2163,6 +2164,8 @@ void Impact(int x, int y)
     {
       Feld[x][y] = EL_AMOEBA_CREATING;
       Store[x][y] = EL_AMOEBA_WET;
+
+      ResetRandomAnimationValue(x, y);
     }
     return;
   }
@@ -2170,7 +2173,8 @@ void Impact(int x, int y)
   if (!lastline && object_hit)		/* check which object was hit */
   {
     if (CAN_CHANGE(element) && 
-	(smashed == EL_MAGIC_WALL || smashed == EL_BD_MAGIC_WALL))
+	(smashed == EL_MAGIC_WALL ||
+	 smashed == EL_BD_MAGIC_WALL))
     {
       int xx, yy;
       int activated_magic_wall =
@@ -2191,29 +2195,31 @@ void Impact(int x, int y)
 			    SND_BD_MAGIC_WALL_ACTIVATING));
     }
 
-    if (IS_PLAYER(x, y+1))
+    if (IS_PLAYER(x, y + 1))
     {
       KillHeroUnlessProtected(x, y+1);
       return;
     }
     else if (smashed == EL_PENGUIN)
     {
-      Bang(x, y+1);
+      Bang(x, y + 1);
       return;
     }
     else if (element == EL_BD_DIAMOND)
     {
       if (IS_ENEMY(smashed) && IS_BD_ELEMENT(smashed))
       {
-	Bang(x, y+1);
+	Bang(x, y + 1);
 	return;
       }
     }
-    else if ((element == EL_SP_INFOTRON || element == EL_SP_ZONK) &&
-	     (smashed == EL_SP_SNIKSNAK || smashed == EL_SP_ELECTRON ||
+    else if ((element == EL_SP_INFOTRON ||
+	      element == EL_SP_ZONK) &&
+	     (smashed == EL_SP_SNIKSNAK ||
+	      smashed == EL_SP_ELECTRON ||
 	      smashed == EL_SP_DISK_ORANGE))
     {
-      Bang(x, y+1);
+      Bang(x, y + 1);
       return;
     }
     else if (element == EL_ROCK ||
@@ -2221,19 +2227,23 @@ void Impact(int x, int y)
 	     element == EL_BD_ROCK)
     {
       if (IS_ENEMY(smashed) ||
-	  smashed == EL_BOMB || smashed == EL_SP_DISK_ORANGE ||
+	  smashed == EL_BOMB ||
+	  smashed == EL_SP_DISK_ORANGE ||
 	  smashed == EL_DX_SUPABOMB ||
-	  smashed == EL_SATELLITE || smashed == EL_PIG ||
-	  smashed == EL_DRAGON || smashed == EL_MOLE)
+	  smashed == EL_SATELLITE ||
+	  smashed == EL_PIG ||
+	  smashed == EL_DRAGON ||
+	  smashed == EL_MOLE)
       {
-	Bang(x, y+1);
+	Bang(x, y + 1);
 	return;
       }
-      else if (!IS_MOVING(x, y+1))
+      else if (!IS_MOVING(x, y + 1))
       {
-	if (smashed == EL_LAMP || smashed == EL_LAMP_ACTIVE)
+	if (smashed == EL_LAMP ||
+	    smashed == EL_LAMP_ACTIVE)
 	{
-	  Bang(x, y+1);
+	  Bang(x, y + 1);
 	  return;
 	}
 	else if (smashed == EL_NUT)
@@ -2288,7 +2298,7 @@ void Impact(int x, int y)
 
   /* play sound of object that hits the ground */
   if (lastline || object_hit)
-    PlaySoundLevelElementAction(x, y, element, SND_ACTION_IMPACT);
+    PlaySoundLevelElementAction(x, y, element, ACTION_IMPACT);
 }
 
 void TurnRound(int x, int y)
@@ -2322,18 +2332,18 @@ void TurnRound(int x, int y)
 
   int element = Feld[x][y];
   int old_move_dir = MovDir[x][y];
-  int left_dir = turn[old_move_dir].left;
+  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 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_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;
+  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_BUG || element == EL_BD_BUTTERFLY)
   {
@@ -2577,17 +2587,18 @@ void TurnRound(int x, int y)
     MovDir[x][y] = game.balloon_dir;
     MovDelay[x][y] = 0;
   }
-  else if (element == EL_SPRING_MOVING)
+  else if (element == EL_SPRING)
   {
-    if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) ||
-	(IN_LEV_FIELD(x, y+1) && IS_FREE(x, y+1)))
-    {
-      Feld[x][y] = EL_SPRING;
+    if ((MovDir[x][y] == MV_LEFT || MovDir[x][y] == MV_RIGHT) &&
+	(!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) ||
+	 (IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1))))
       MovDir[x][y] = MV_NO_MOVING;
-    }
+
     MovDelay[x][y] = 0;
   }
-  else if (element == EL_ROBOT || element == EL_SATELLITE || element == EL_PENGUIN)
+  else if (element == EL_ROBOT ||
+	   element == EL_SATELLITE ||
+	   element == EL_PENGUIN)
   {
     int attr_x = -1, attr_y = -1;
 
@@ -2616,7 +2627,7 @@ void TurnRound(int x, int y)
       }
     }
 
-    if (element == EL_ROBOT && ZX>=0 && ZY>=0)
+    if (element == EL_ROBOT && ZX >= 0 && ZY >= 0)
     {
       attr_x = ZX;
       attr_y = ZY;
@@ -2735,14 +2746,16 @@ static boolean JustBeingPushed(int x, int y)
 
 void StartMoving(int x, int y)
 {
+  static boolean use_spring_bug = TRUE;
+  boolean started_moving = FALSE;	/* some elements can fall _and_ move */
   int element = Feld[x][y];
 
   if (Stop[x][y])
     return;
 
-  GfxAction[x][y] = GFX_ACTION_DEFAULT;
+  GfxAction[x][y] = ACTION_DEFAULT;
 
-  if (CAN_FALL(element) && y<lev_fieldy-1)
+  if (CAN_FALL(element) && y < lev_fieldy - 1)
   {
     if ((x>0 && IS_PLAYER(x-1, y)) || (x<lev_fieldx-1 && IS_PLAYER(x+1, y)))
       if (JustBeingPushed(x, y))
@@ -2753,6 +2766,8 @@ void StartMoving(int x, int y)
       if (IS_FREE(x, y+1))
       {
 	InitMovingField(x, y, MV_DOWN);
+	started_moving = TRUE;
+
 	Feld[x][y] = EL_QUICKSAND_EMPTYING;
 	Store[x][y] = EL_ROCK;
 	PlaySoundLevel(x, y, SND_QUICKSAND_EMPTYING);
@@ -2780,6 +2795,8 @@ void StartMoving(int x, int y)
 	     Feld[x][y+1] == EL_QUICKSAND_EMPTY)
     {
       InitMovingField(x, y, MV_DOWN);
+      started_moving = TRUE;
+
       Feld[x][y] = EL_QUICKSAND_FILLING;
       Store[x][y] = element;
       PlaySoundLevel(x, y, SND_QUICKSAND_FILLING);
@@ -2789,6 +2806,8 @@ void StartMoving(int x, int y)
       if (IS_FREE(x, y+1))
       {
 	InitMovingField(x, y, MV_DOWN);
+	started_moving = TRUE;
+
 	Feld[x][y] = EL_MAGIC_WALL_EMPTYING;
 	Store[x][y] = EL_CHANGED(Store[x][y]);
       }
@@ -2815,6 +2834,8 @@ void StartMoving(int x, int y)
       if (IS_FREE(x, y+1))
       {
 	InitMovingField(x, y, MV_DOWN);
+	started_moving = TRUE;
+
 	Feld[x][y] = EL_BD_MAGIC_WALL_EMPTYING;
 	Store[x][y] = EL_CHANGED2(Store[x][y]);
       }
@@ -2841,25 +2862,50 @@ void StartMoving(int x, int y)
 	      Feld[x][y+1] == EL_BD_MAGIC_WALL_ACTIVE))
     {
       InitMovingField(x, y, MV_DOWN);
+      started_moving = TRUE;
+
       Feld[x][y] =
 	(Feld[x][y+1] == EL_MAGIC_WALL_ACTIVE ? EL_MAGIC_WALL_FILLING :
 	 EL_BD_MAGIC_WALL_FILLING);
       Store[x][y] = element;
     }
+#if 0
     else if (CAN_SMASH(element) && Feld[x][y+1] == EL_ACID)
+#else
+    else if (CAN_FALL(element) && Feld[x][y+1] == EL_ACID)
+#endif
     {
-      Blurb(x, y);
+      SplashAcid(x, y);
+
       InitMovingField(x, y, MV_DOWN);
+      started_moving = TRUE;
+
       Store[x][y] = EL_ACID;
+#if 0
+      /* !!! TEST !!! better use "_FALLING" etc. !!! */
+      GfxAction[x][y+1] = ACTION_ACTIVE;
+#endif
     }
     else if (CAN_SMASH(element) && Feld[x][y+1] == EL_BLOCKED &&
 	     JustStopped[x][y])
     {
       Impact(x, y);
     }
+    else if (IS_FREE(x, y+1) && element == EL_SPRING && use_spring_bug)
+    {
+      if (MovDir[x][y] == MV_NO_MOVING)
+      {
+	InitMovingField(x, y, MV_DOWN);
+	started_moving = TRUE;
+      }
+    }
     else if (IS_FREE(x, y+1))
     {
+      if (JustStopped[x][y])	/* prevent animation from being restarted */
+	MovDir[x][y] = MV_DOWN;
+
       InitMovingField(x, y, MV_DOWN);
+      started_moving = TRUE;
     }
     else if (element == EL_AMOEBA_DROP)
     {
@@ -2897,6 +2943,7 @@ void StartMoving(int x, int y)
 	  left = !(right = RND(2));
 
 	InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
+	started_moving = TRUE;
       }
     }
     else if (IS_BELT_ACTIVE(Feld[x][y+1]))
@@ -2908,24 +2955,48 @@ void StartMoving(int x, int y)
 
       if ((belt_dir == MV_LEFT  && left_is_free) ||
 	  (belt_dir == MV_RIGHT && right_is_free))
+      {
 	InitMovingField(x, y, belt_dir);
+	started_moving = TRUE;
+
+	GfxAction[x][y] = ACTION_DEFAULT;
+      }
     }
   }
-  else if (CAN_MOVE(element))
+
+  /* not "else if" because of EL_SPRING */
+  if (CAN_MOVE(element) && !started_moving)
   {
     int newx, newy;
 
-    if ((element == EL_SATELLITE || element == EL_BALLOON ||
-	 element == EL_SPRING_MOVING)
+    if ((element == EL_SATELLITE ||
+	 element == EL_BALLOON ||
+	 element == EL_SPRING)
 	&& JustBeingPushed(x, y))
       return;
 
+#if 0
+#if 0
+    if (element == EL_SPRING && MovDir[x][y] == MV_DOWN)
+      Feld[x][y + 1] = EL_EMPTY;	/* was set to EL_BLOCKED above */
+#else
+    if (element == EL_SPRING && MovDir[x][y] != MV_NO_MOVING)
+    {
+      Moving2Blocked(x, y, &newx, &newy);
+      if (Feld[newx][newy] == EL_BLOCKED)
+	Feld[newx][newy] = EL_EMPTY;	/* was set to EL_BLOCKED above */
+    }
+#endif
+#endif
+
     if (!MovDelay[x][y])	/* start new movement phase */
     {
       /* all objects that can change their move direction after each step */
       /* (MAMPFER, MAMPFER2 and PACMAN go straight until they hit a wall  */
 
-      if (element!=EL_YAMYAM && element!=EL_DARK_YAMYAM && element!=EL_PACMAN)
+      if (element != EL_YAMYAM &&
+	  element != EL_DARK_YAMYAM &&
+	  element != EL_PACMAN)
       {
 	TurnRound(x, y);
 
@@ -2943,36 +3014,24 @@ void StartMoving(int x, int y)
       MovDelay[x][y]--;
 
       if (element == EL_ROBOT ||
-	  element == EL_YAMYAM || element == EL_DARK_YAMYAM)
+	  element == EL_YAMYAM ||
+	  element == EL_DARK_YAMYAM)
       {
-	if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-	{
-	  int graphic = el2img(element);
-	  int frame = getGraphicAnimationFrame(graphic, MovDelay[x][y] % 8);
-
-	  DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
-	}
-
-	if (MovDelay[x][y] % 4 == 3)
-	{
-	  if (element == EL_YAMYAM)
-	    PlaySoundLevel(x, y, SND_YAMYAM_WAITING);
-	  else if (element == EL_DARK_YAMYAM)
-	    PlaySoundLevel(x, y, SND_DARK_YAMYAM_WAITING);
-	}
+	DrawLevelElementAnimationIfNeeded(x, y, element);
+	PlaySoundLevelAction(x, y, ACTION_WAITING);
       }
       else if (element == EL_SP_ELECTRON)
-	DrawGraphicAnimation(x, y, IMG_SP_ELECTRON);
+	DrawLevelElementAnimationIfNeeded(x, y, element);
       else if (element == EL_DRAGON)
       {
 	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	? IMG_FLAMES_LEFT1 :
-		       dir == MV_RIGHT	? IMG_FLAMES_RIGHT1 :
-		       dir == MV_UP	? IMG_FLAMES_UP1 :
-		       dir == MV_DOWN	? IMG_FLAMES_DOWN1 : IMG_EMPTY);
+	int graphic = (dir == MV_LEFT	? IMG_FLAMES1_LEFT :
+		       dir == MV_RIGHT	? IMG_FLAMES1_RIGHT :
+		       dir == MV_UP	? IMG_FLAMES1_UP :
+		       dir == MV_DOWN	? IMG_FLAMES1_DOWN : IMG_EMPTY);
 	int frame = getGraphicAnimationFrame(graphic, -1);
 
 	for (i=1; i<=3; i++)
@@ -3009,7 +3068,7 @@ void StartMoving(int x, int y)
 
       if (MovDelay[x][y])	/* element still has to wait some time */
       {
-	PlaySoundLevelAction(x, y, SND_ACTION_WAITING);
+	PlaySoundLevelAction(x, y, ACTION_WAITING);
 
 	return;
       }
@@ -3039,7 +3098,7 @@ void StartMoving(int x, int y)
 	     IN_LEV_FIELD(newx, newy) &&
 	     MovDir[x][y] == MV_DOWN && Feld[newx][newy] == EL_ACID)
     {
-      Blurb(x, y);
+      SplashAcid(x, y);
       Store[x][y] = EL_ACID;
     }
     else if (element == EL_PENGUIN && IN_LEV_FIELD(newx, newy))
@@ -3220,23 +3279,23 @@ void StartMoving(int x, int y)
 	       element == EL_SP_SNIKSNAK || element == EL_MOLE)
 	DrawLevelField(x, y);
       else if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY)
-	DrawGraphicAnimation(x, y, el2img(element));
+	DrawLevelElementAnimationIfNeeded(x, y, element);
       else if (element == EL_SATELLITE)
-	DrawGraphicAnimation(x, y, IMG_SATELLITE);
+	DrawLevelElementAnimationIfNeeded(x, y, element);
       else if (element == EL_SP_ELECTRON)
-	DrawGraphicAnimation(x, y, IMG_SP_ELECTRON);
+	DrawLevelElementAnimationIfNeeded(x, y, element);
 
       if (DONT_TOUCH(element))
 	TestIfBadThingTouchesHero(x, y);
 
-      PlaySoundLevelAction(x, y, SND_ACTION_WAITING);
+      PlaySoundLevelAction(x, y, ACTION_WAITING);
 
       return;
     }
 
     InitMovingField(x, y, MovDir[x][y]);
 
-    PlaySoundLevelAction(x, y, SND_ACTION_MOVING);
+    PlaySoundLevelAction(x, y, ACTION_MOVING);
   }
 
   if (MovDir[x][y])
@@ -3249,7 +3308,7 @@ void ContinueMoving(int x, int y)
   int direction = MovDir[x][y];
   int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
   int dy = (direction == MV_UP   ? -1 : direction == MV_DOWN  ? +1 : 0);
-  int horiz_move = (dx!=0);
+  int horiz_move = (dx != 0);
   int newx = x + dx, newy = y + dy;
   int step = (horiz_move ? dx : dy) * TILEX / 8;
 
@@ -3266,8 +3325,8 @@ void ContinueMoving(int x, int y)
   else if (CAN_FALL(element) && horiz_move &&
 	   y < lev_fieldy-1 && IS_BELT_ACTIVE(Feld[x][y+1]))
     step /= 2;
-  else if (element == EL_SPRING_MOVING)
-    step*=2;
+  else if (element == EL_SPRING && horiz_move)
+    step *= 2;
 
 #if OLD_GAME_BEHAVIOUR
   else if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element))
@@ -3359,11 +3418,28 @@ void ContinueMoving(int x, int y)
     MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
     MovDelay[newx][newy] = 0;
 
+    /* copy animation control values to new field */
+    GfxFrame[newx][newy]  = GfxFrame[x][y];
     GfxAction[newx][newy] = GfxAction[x][y];	/* keep action one frame */
-    GfxAction[x][y] = GFX_ACTION_DEFAULT;
+    GfxRandom[newx][newy] = GfxRandom[x][y];	/* keep same random value */
 
+    ResetGfxAnimation(x, y);	/* reset animation values for old field */
+
+#if 1
+#if 0
     if (!CAN_MOVE(element))
       MovDir[newx][newy] = 0;
+#else
+    /*
+    if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN)
+      MovDir[newx][newy] = 0;
+    */
+
+    if (!CAN_MOVE(element) ||
+	(element == EL_SPRING && MovDir[newx][newy] == MV_DOWN))
+      MovDir[newx][newy] = 0;
+#endif
+#endif
 
     DrawLevelField(x, y);
     DrawLevelField(newx, newy);
@@ -3386,9 +3462,6 @@ void ContinueMoving(int x, int y)
   }
   else				/* still moving on */
   {
-    if (GfxAction[x][y] == GFX_ACTION_DEFAULT)
-      GfxAction[x][y] = GFX_ACTION_MOVING;
-
     DrawLevelField(x, y);
   }
 }
@@ -3865,125 +3938,33 @@ void Life(int ax, int ay)
 		   SND_BIOMAZE_CREATING);
 }
 
-void RobotWheel(int x, int y)
+static void InitRobotWheel(int x, int y)
 {
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
+  MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
+}
 
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-    if (MovDelay[x][y])
-    {
-      if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-      {
-	int frame = getGraphicAnimationFrame(IMG_ROBOT_WHEEL_ACTIVE, -1);
+static void RunRobotWheel(int x, int y)
+{
+  PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE);
+}
 
-	DrawGraphic(SCREENX(x), SCREENY(y), IMG_ROBOT_WHEEL_ACTIVE, frame);
-      }
+static void StopRobotWheel(int x, int y)
+{
+  if (ZX == x && ZY == y)
+    ZX = ZY = -1;
+}
 
-      if (!(MovDelay[x][y]%4))
-	PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE);
-      return;
-    }
-  }
-
-  Feld[x][y] = EL_ROBOT_WHEEL;
-  DrawLevelField(x, y);
-  if (ZX == x && ZY == y)
-    ZX = ZY = -1;
-}
-
-void TimegateWheel(int x, int y)
-{
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-    if (MovDelay[x][y])
-    {
-      if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-      {
-	int frame = getGraphicAnimationFrame(IMG_TIMEGATE_SWITCH_ACTIVE, -1);
-
-	DrawGraphic(SCREENX(x), SCREENY(y), IMG_TIMEGATE_SWITCH_ACTIVE, frame);
-      }
-
-      if (!(MovDelay[x][y]%4))
-	PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE);
-      return;
-    }
-  }
-
-  Feld[x][y] = EL_TIMEGATE_SWITCH;
-  DrawLevelField(x, y);
-  if (ZX == x && ZY == y)
-    ZX = ZY = -1;
-}
-
-void Blubber(int x, int y)
+static void InitTimegateWheel(int x, int y)
 {
-  DrawGraphicAnimation(x, y, IMG_ACID);
-}
-
-void NussKnacken(int x, int y)
-{
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 7;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-    if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_NUT_CRACKING,
-					   6 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_NUT_CRACKING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_EMERALD;
-      DrawLevelField(x, y);
-    }
-  }
-}
-
-void BreakingPearl(int x, int y)
-{
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 9;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-    if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_PEARL_BREAKING,
-					   8 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_PEARL_BREAKING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_EMPTY;
-      DrawLevelField(x, y);
-    }
-  }
+  MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
 }
 
-void SiebAktivieren(int x, int y, int type)
+static void RunTimegateWheel(int x, int y)
 {
-  int graphic = (type == 1 ? IMG_MAGIC_WALL_FULL : IMG_BD_MAGIC_WALL_FULL);
-
-  DrawGraphicAnimation(x, y, graphic);
+  PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE);
 }
 
-void AusgangstuerPruefen(int x, int y)
+void CheckExit(int x, int y)
 {
   if (local_player->gems_still_needed > 0 ||
       local_player->sokobanfields_still_needed > 0 ||
@@ -3992,167 +3973,17 @@ void AusgangstuerPruefen(int x, int y)
 
   Feld[x][y] = EL_EXIT_OPENING;
 
-  PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) :
-		 (x > LEVELX(BX2) ? LEVELX(BX2) : x),
-		 y < LEVELY(BY1) ? LEVELY(BY1) :
-		 (y > LEVELY(BY2) ? LEVELY(BY2) : y),
-		 SND_EXIT_OPENING);
+  PlaySoundLevelNearest(x, y, SND_EXIT_OPENING);
 }
 
-void AusgangstuerPruefen_SP(int x, int y)
+void CheckExitSP(int x, int y)
 {
   if (local_player->gems_still_needed > 0)
     return;
 
   Feld[x][y] = EL_SP_EXIT_OPEN;
 
-  PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) :
-		 (x > LEVELX(BX2) ? LEVELX(BX2) : x),
-		 y < LEVELY(BY1) ? LEVELY(BY1) :
-		 (y > LEVELY(BY2) ? LEVELY(BY2) : y),
-		 SND_SP_EXIT_OPENING);
-}
-
-void AusgangstuerOeffnen(int x, int y)
-{
-  int delay = 6;
-
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 5 * delay;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    int tuer;
-
-    MovDelay[x][y]--;
-    tuer = MovDelay[x][y]/delay;
-    if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_EXIT_OPENING,
-					   29 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_EXIT_OPENING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_EXIT_OPEN;
-      DrawLevelField(x, y);
-    }
-  }
-}
-
-void AusgangstuerBlinken(int x, int y)
-{
-  DrawGraphicAnimation(x, y, IMG_EXIT_OPEN);
-}
-
-void OpenSwitchgate(int x, int y)
-{
-  int delay = 6;
-
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 5 * delay;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-
-    if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_SWITCHGATE_OPENING,
-					   29 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_SWITCHGATE_OPENING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_SWITCHGATE_OPEN;
-      DrawLevelField(x, y);
-    }
-  }
-}
-
-void CloseSwitchgate(int x, int y)
-{
-  int delay = 6;
-
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 5 * delay;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-
-    if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_SWITCHGATE_CLOSING,
-					   29 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_SWITCHGATE_CLOSING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_SWITCHGATE_CLOSED;
-      DrawLevelField(x, y);
-    }
-  }
-}
-
-void OpenTimegate(int x, int y)
-{
-  int delay = 6;
-
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 5 * delay;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-
-    if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_TIMEGATE_OPENING,
-					   29 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_TIMEGATE_OPENING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_TIMEGATE_OPEN;
-      DrawLevelField(x, y);
-    }
-  }
-}
-
-void CloseTimegate(int x, int y)
-{
-  int delay = 6;
-
-  if (!MovDelay[x][y])		/* next animation frame */
-    MovDelay[x][y] = 5 * delay;
-
-  if (MovDelay[x][y])		/* wait some time before next frame */
-  {
-    MovDelay[x][y]--;
-
-    if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    {
-      int frame = getGraphicAnimationFrame(IMG_TIMEGATE_CLOSING,
-					   29 - MovDelay[x][y]);
-
-      DrawGraphic(SCREENX(x), SCREENY(y), IMG_TIMEGATE_CLOSING, frame);
-    }
-
-    if (!MovDelay[x][y])
-    {
-      Feld[x][y] = EL_TIMEGATE_CLOSED;
-      DrawLevelField(x, y);
-    }
-  }
+  PlaySoundLevelNearest(x, y, SND_SP_EXIT_OPENING);
 }
 
 static void CloseAllOpenTimegates()
@@ -4180,39 +4011,37 @@ void EdelsteinFunkeln(int x, int y)
     return;
 
   if (Feld[x][y] == EL_BD_DIAMOND)
-    DrawGraphicAnimation(x, y, IMG_BD_DIAMOND);
-  else
-  {
-    if (!MovDelay[x][y])	/* next animation frame */
-      MovDelay[x][y] = 11 * !SimpleRND(500);
+    return;
 
-    if (MovDelay[x][y])		/* wait some time before next frame */
-    {
-      MovDelay[x][y]--;
+  if (MovDelay[x][y] == 0)	/* next animation frame */
+    MovDelay[x][y] = 11 * !SimpleRND(500);
 
-      if (setup.direct_draw && MovDelay[x][y])
-	SetDrawtoField(DRAW_BUFFERED);
+  if (MovDelay[x][y] != 0)	/* wait some time before next frame */
+  {
+    MovDelay[x][y]--;
 
-      DrawGraphic(SCREENX(x), SCREENY(y), el2img(Feld[x][y]), 0);
+    if (setup.direct_draw && MovDelay[x][y])
+      SetDrawtoField(DRAW_BUFFERED);
 
-      if (MovDelay[x][y])
-      {
-	int frame = getGraphicAnimationFrame(IMG_TWINKLE_WHITE,
-					     10 - MovDelay[x][y]);
+    DrawLevelElementAnimation(x, y, Feld[x][y]);
 
-	DrawGraphicThruMask(SCREENX(x), SCREENY(y), IMG_TWINKLE_WHITE, frame);
+    if (MovDelay[x][y] != 0)
+    {
+      int frame = getGraphicAnimationFrame(IMG_TWINKLE_WHITE,
+					   10 - MovDelay[x][y]);
 
-	if (setup.direct_draw)
-	{
-	  int dest_x, dest_y;
+      DrawGraphicThruMask(SCREENX(x), SCREENY(y), IMG_TWINKLE_WHITE, frame);
 
-	  dest_x = FX + SCREENX(x) * TILEX;
-	  dest_y = FY + SCREENY(y) * TILEY;
+      if (setup.direct_draw)
+      {
+	int dest_x, dest_y;
 
-	  BlitBitmap(drawto_field, window,
-		     dest_x, dest_y, TILEX, TILEY, dest_x, dest_y);
-	  SetDrawtoField(DRAW_DIRECT);
-	}
+	dest_x = FX + SCREENX(x) * TILEX;
+	dest_y = FY + SCREENY(y) * TILEY;
+
+	BlitBitmap(drawto_field, window,
+		   dest_x, dest_y, TILEX, TILEY, dest_x, dest_y);
+	SetDrawtoField(DRAW_DIRECT);
       }
     }
   }
@@ -4417,140 +4246,99 @@ void CheckForDragon(int x, int y)
   }
 }
 
-static void CheckBuggyBase(int x, int y)
+static void InitBuggyBase(int x, int y)
 {
   int element = Feld[x][y];
+  int activating_delay = FRAMES_PER_SECOND / 4;
+
+  MovDelay[x][y] =
+    (element == EL_SP_BUGGY_BASE ?
+     2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND) - activating_delay :
+     element == EL_SP_BUGGY_BASE_ACTIVATING ?
+     activating_delay :
+     element == EL_SP_BUGGY_BASE_ACTIVE ?
+     1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND) : 1);
+}
 
-  if (element == EL_SP_BUGGY_BASE)
+static void WarnBuggyBase(int x, int y)
+{
+  int i;
+  static int xy[4][2] =
   {
-    if (!MovDelay[x][y])	/* wait some time before activating base */
-      MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
-
-    if (MovDelay[x][y])
-    {
-      MovDelay[x][y]--;
-      if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-        DrawGraphic(SCREENX(x), SCREENY(y), IMG_SP_BUGGY_BASE, 0);
-      if (MovDelay[x][y])
-	return;
+    { 0, -1 },
+    { -1, 0 },
+    { +1, 0 },
+    { 0, +1 }
+  };
 
-      Feld[x][y] = EL_SP_BUGGY_BASE_ACTIVE;
-    }
-  }
-  else if (element == EL_SP_BUGGY_BASE_ACTIVE)
+  for (i=0; i<4; i++)
   {
-    if (!MovDelay[x][y])	/* start activating buggy base */
-      MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND);
+    int xx = x + xy[i][0], yy = y + xy[i][1];
 
-    if (MovDelay[x][y])
+    if (IS_PLAYER(xx, yy))
     {
-      MovDelay[x][y]--;
-      if (MovDelay[x][y])
-      {
-	int i;
-	static int xy[4][2] =
-	{
-	  { 0, -1 },
-	  { -1, 0 },
-	  { +1, 0 },
-	  { 0, +1 }
-	};
+      PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE);
 
-	if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-	{
-	  int graphic = IMG_SP_BUGGY_BASE_ACTIVE;
-	  int frame = getGraphicAnimationFrame(graphic, SimpleRND(100));
-
-          DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
-	}
+      break;
+    }
+  }
+}
 
-	for (i=0; i<4; i++)
-	{
-	  int xx = x + xy[i][0], yy = y + xy[i][1];
+static void InitTrap(int x, int y)
+{
+  MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
+}
 
-	  if (IS_PLAYER(xx, yy))
-	  {
-	    PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE);
-	    break;
-	  }
-	}
+static void ActivateTrap(int x, int y)
+{
+  PlaySoundLevel(x, y, SND_TRAP_ACTIVATING);
+}
 
-	return;
-      }
+static void ChangeActiveTrap(int x, int y)
+{
+  int graphic = IMG_TRAP_ACTIVE;
 
-      Feld[x][y] = EL_SP_BUGGY_BASE;
-      DrawLevelField(x, y);
-    }
-  }
+  /* if new animation frame was drawn, correct crumbled sand border */
+  if (IS_NEW_FRAME(GfxFrame[x][y], graphic))
+    DrawCrumbledSand(SCREENX(x), SCREENY(y));
 }
 
-static void CheckTrap(int x, int y)
+static void ChangeElement(int x, int y)
 {
   int element = Feld[x][y];
 
-  if (element == EL_TRAP)
+  if (MovDelay[x][y] == 0)		/* initialize element change */
   {
-    if (!MovDelay[x][y])	/* wait some time before activating trap */
-      MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
+    MovDelay[x][y] = changing_element[element].change_delay + 1;
 
-    if (MovDelay[x][y])
-    {
-      MovDelay[x][y]--;
-      if (MovDelay[x][y])
-	return;
+    ResetGfxAnimation(x, y);
+    ResetRandomAnimationValue(x, y);
 
-      Feld[x][y] = EL_TRAP_ACTIVE;
-      PlaySoundLevel(x, y, SND_TRAP_ACTIVATING);
-    }
+    if (changing_element[element].pre_change_function)
+      changing_element[element].pre_change_function(x, y);
   }
-  else if (element == EL_TRAP_ACTIVE)
-  {
-    int delay = 4;
-    int num_frames = 8;
-
-    if (!MovDelay[x][y])	/* start activating trap */
-      MovDelay[x][y] = num_frames * delay;
-
-    if (MovDelay[x][y])
-    {
-      MovDelay[x][y]--;
-
-      if (MovDelay[x][y])
-      {
-	if (!(MovDelay[x][y] % delay))
-	{
-	  if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-	  {
-	    int graphic = IMG_TRAP_ACTIVE;
-	    int frame = getGraphicAnimationFrame(graphic, 31 - MovDelay[x][y]);
 
-	    DrawGraphic(SCREENX(x),SCREENY(y), graphic, frame);
-	    DrawCrumbledSand(SCREENX(x), SCREENY(y));
-	  }
-	}
+  MovDelay[x][y]--;
 
-	return;
-      }
+  if (MovDelay[x][y] != 0)		/* continue element change */
+  {
+    if (IS_ANIMATED(el2img(element)))
+      DrawLevelElementAnimationIfNeeded(x, y, element);
 
-      Feld[x][y] = EL_TRAP;
-      DrawLevelField(x, y);
-    }
+    if (changing_element[element].change_function)
+      changing_element[element].change_function(x, y);
   }
-}
-
-static void DrawBeltAnimation(int x, int y, int element)
-{
-  int belt_nr = getBeltNrFromBeltActiveElement(element);
-  int belt_dir = game.belt_dir[belt_nr];
-
-  if (belt_dir != MV_NO_MOVING)
+  else					/* finish element change */
   {
-    int graphic = el2img(element);
+    Feld[x][y] = changing_element[element].next_element;
 
-    DrawGraphicAnimation(x, y, graphic);
+    ResetGfxAnimation(x, y);
+    ResetRandomAnimationValue(x, y);
 
-    if (!(FrameCounter % 2))
-      PlaySoundLevel(x, y, SND_CONVEYOR_BELT_ACTIVE);
+    DrawLevelField(x, y);
+
+    if (changing_element[element].post_change_function)
+      changing_element[element].post_change_function(x, y);
   }
 }
 
@@ -4558,9 +4346,6 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
 {
   static byte stored_player_action[MAX_PLAYERS];
   static int num_stored_actions = 0;
-#if 0
-  static boolean save_tape_entry = FALSE;
-#endif
   boolean moved = FALSE, snapped = FALSE, bombed = FALSE;
   int left	= player_action & JOY_LEFT;
   int right	= player_action & JOY_RIGHT;
@@ -4579,11 +4364,6 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
 
   if (player_action)
   {
-#if 0
-    save_tape_entry = TRUE;
-#endif
-    player->frame_reset_delay = 0;
-
     if (button1)
       snapped = SnapField(player, dx, dy);
     else
@@ -4602,20 +4382,7 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
       }
     }
 
-#if 0
-    if (tape.recording && (moved || snapped || bombed))
-    {
-      if (bombed && !moved)
-	player_action &= JOY_BUTTON;
-
-      stored_player_action[player->index_nr] = player_action;
-      save_tape_entry = TRUE;
-    }
-    else if (tape.playing && snapped)
-      SnapField(player, 0, 0);			/* stop snapping */
-#else
     stored_player_action[player->index_nr] = player_action;
-#endif
   }
   else
   {
@@ -4625,82 +4392,25 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
     SnapField(player, 0, 0);
     CheckGravityMovement(player);
 
-#if 1
+    InitPlayerGfxAnimation(player, ACTION_DEFAULT);
+
     if (player->MovPos == 0)	/* needed for tape.playing */
       player->is_moving = FALSE;
-#endif
-#if 0
-    if (player->MovPos == 0)	/* needed for tape.playing */
-      player->last_move_dir = MV_NO_MOVING;
-
-    /* !!! CHECK THIS AGAIN !!!
-       (Seems to be needed for some EL_ROBOT stuff, but breaks
-       tapes when walking through pipes!)
-    */
-
-    /* it seems that "player->last_move_dir" is misused as some sort of
-       "player->is_just_moving_in_this_moment", which is needed for the
-       robot stuff (robots don't kill players when they are moving)
-    */
-#endif 
-
-    /* if the player does not move for some time, reset animation to start */
-    if (++player->frame_reset_delay > player->move_delay_value)
-      player->Frame = 0;
   }
 
-#if 0
-  if (tape.recording && num_stored_actions >= MAX_PLAYERS && save_tape_entry)
-  {
-    TapeRecordAction(stored_player_action);
-    num_stored_actions = 0;
-    save_tape_entry = FALSE;
-  }
-#else
   if (tape.recording && num_stored_actions >= MAX_PLAYERS)
   {
     TapeRecordAction(stored_player_action);
     num_stored_actions = 0;
   }
-#endif
-
-#if 0
-  if (tape.playing && !tape.pausing && !player_action &&
-      tape.counter < tape.length)
-  {
-    int jx = player->jx, jy = player->jy;
-    int next_joy =
-      tape.pos[tape.counter].action[player->index_nr] & (JOY_LEFT|JOY_RIGHT);
-
-    if ((next_joy == JOY_LEFT || next_joy == JOY_RIGHT) &&
-	(player->MovDir != JOY_UP && player->MovDir != JOY_DOWN))
-    {
-      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_SATELLITE ? 2 :
-			  (el == EL_BALLOON || el == EL_SPRING) ? 0 : 10);
-
-	if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
-	{
-	  player->MovDir = next_joy;
-	  player->Frame = FrameCounter % 4;
-	  player->Pushing = TRUE;
-	}
-      }
-    }
-  }
-#endif
 }
 
 void GameActions()
 {
   static unsigned long action_delay = 0;
   unsigned long action_delay_value;
-  int sieb_x = 0, sieb_y = 0;
-  int i, x, y, element;
+  int magic_wall_x = 0, magic_wall_y = 0;
+  int i, x, y, element, graphic;
   byte *recorded_player_action;
   byte summarized_player_action = 0;
 
@@ -4783,38 +4493,20 @@ void GameActions()
 
   ScrollScreen(NULL, SCROLL_GO_ON);
 
-
-
-#ifdef DEBUG
-#if 0
-  if (TimeFrames == 0 && local_player->active)
-  {
-    extern unsigned int last_RND();
-
-    printf("DEBUG: %03d last RND was %d \t [state checksum is %d]\n",
-	   TimePlayed, last_RND(), getStateCheckSum(TimePlayed));
-  }
-#endif
-#endif
-
-#ifdef DEBUG
-#if 0
-  if (GameFrameDelay >= 500)
-    printf("FrameCounter == %d\n", FrameCounter);
-#endif
-#endif
-
-
-
   FrameCounter++;
   TimeFrames++;
 
+  for (i=0; i<MAX_PLAYERS; i++)
+    stored_player[i].Frame++;
+
   for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
   {
     Stop[x][y] = FALSE;
     if (JustStopped[x][y] > 0)
       JustStopped[x][y]--;
 
+    GfxFrame[x][y]++;
+
 #if DEBUG
     if (IS_BLOCKED(x, y))
     {
@@ -4835,24 +4527,63 @@ void GameActions()
   for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
   {
     element = Feld[x][y];
+    graphic = el2img(element);
+
+#if 1
+    if (graphic_info[graphic].anim_global_sync)
+      GfxFrame[x][y] = FrameCounter;
+#endif
+
+    if (ANIM_MODE(graphic) == ANIM_RANDOM &&
+	IS_NEXT_FRAME(GfxFrame[x][y], graphic))
+      ResetRandomAnimationValue(x, y);
+
+    SetRandomAnimationValue(x, y);
 
     if (IS_INACTIVE(element))
+    {
+
+#if 1
+      if (IS_ANIMATED(graphic))
+	DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
+#endif
+
       continue;
+    }
 
     if (!IS_MOVING(x, y) && (CAN_FALL(element) || CAN_MOVE(element)))
     {
       StartMoving(x, y);
 
+      if (IS_ANIMATED(graphic) &&
+	  !IS_MOVING(x, y) &&
+	  !Stop[x][y])
+	DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
+
       if (IS_GEM(element) || element == EL_SP_INFOTRON)
 	EdelsteinFunkeln(x, y);
     }
+
+#if 1
+    else if ((element == EL_ACID ||
+	      element == EL_EXIT_OPEN ||
+	      element == EL_SP_EXIT_OPEN ||
+	      element == EL_SP_TERMINAL ||
+	      element == EL_SP_TERMINAL_ACTIVE ||
+	      element == EL_EXTRA_TIME ||
+	      element == EL_SHIELD_NORMAL ||
+	      element == EL_SHIELD_DEADLY) &&
+	     IS_ANIMATED(graphic))
+      DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
+#endif
+
     else if (IS_MOVING(x, y))
       ContinueMoving(x, y);
     else if (IS_ACTIVE_BOMB(element))
       CheckDynamite(x, y);
 #if 0
     else if (element == EL_EXPLOSION && !game.explosions_delayed)
-      Explode(x, y, Frame[x][y], EX_NORMAL);
+      Explode(x, y, ExplodePhase[x][y], EX_NORMAL);
 #endif
     else if (element == EL_AMOEBA_CREATING)
       AmoebeWaechst(x, y);
@@ -4866,29 +4597,31 @@ void GameActions()
 
     else if (element == EL_GAMEOFLIFE || element == EL_BIOMAZE)
       Life(x, y);
+#if 0
     else if (element == EL_ROBOT_WHEEL_ACTIVE)
       RobotWheel(x, y);
     else if (element == EL_TIMEGATE_SWITCH_ACTIVE)
       TimegateWheel(x, y);
-    else if (element == EL_ACID)
-      Blubber(x, y);
+#endif
+#if 0
     else if (element == EL_ACID_SPLASH_LEFT ||
 	     element == EL_ACID_SPLASH_RIGHT)
-      Blurb(x, y);
+      SplashAcid(x, y);
+#endif
+#if 0
     else if (element == EL_NUT_CRACKING)
       NussKnacken(x, y);
     else if (element == EL_PEARL_BREAKING)
       BreakingPearl(x, y);
+#endif
     else if (element == EL_EXIT_CLOSED)
-      AusgangstuerPruefen(x, y);
+      CheckExit(x, y);
     else if (element == EL_SP_EXIT_CLOSED)
-      AusgangstuerPruefen_SP(x, y);
+      CheckExitSP(x, y);
+#if 0
     else if (element == EL_EXIT_OPENING)
       AusgangstuerOeffnen(x, y);
-    else if (element == EL_EXIT_OPEN)
-      AusgangstuerBlinken(x, y);
-    else if (element == EL_SP_EXIT_OPEN)
-      ;		/* !!! ADD SOME (OPTIONAL) ANIMATIONS HERE !!! */
+#endif
     else if (element == EL_WALL_GROWING_ACTIVE)
       MauerWaechst(x, y);
     else if (element == EL_WALL_GROWING ||
@@ -4898,21 +4631,14 @@ void GameActions()
       MauerAbleger(x, y);
     else if (element == EL_FLAMES)
       CheckForDragon(x, y);
-    else if (element == EL_SP_BUGGY_BASE || element == EL_SP_BUGGY_BASE_ACTIVE)
+#if 0
+    else if (element == EL_SP_BUGGY_BASE ||
+	     element == EL_SP_BUGGY_BASE_ACTIVATING ||
+	     element == EL_SP_BUGGY_BASE_ACTIVE)
       CheckBuggyBase(x, y);
-    else if (element == EL_TRAP || element == EL_TRAP_ACTIVE)
+    else if (element == EL_TRAP ||
+	     element == EL_TRAP_ACTIVE)
       CheckTrap(x, y);
-    else if (element == EL_SP_TERMINAL)
-      DrawGraphicAnimation(x, y, IMG_SP_TERMINAL);
-    else if (element == EL_SP_TERMINAL_ACTIVE)
-    {
-      DrawGraphicAnimation(x, y, IMG_SP_TERMINAL_ACTIVE);
-
-#if 0
-      if (!(FrameCounter % 4))
-	PlaySoundLevel(x, y, SND_SP_TERMINAL_ACTIVE);
-#endif
-    }
     else if (IS_BELT_ACTIVE(element))
       DrawBeltAnimation(x, y, element);
     else if (element == EL_SWITCHGATE_OPENING)
@@ -4923,52 +4649,36 @@ void GameActions()
       OpenTimegate(x, y);
     else if (element == EL_TIMEGATE_CLOSING)
       CloseTimegate(x, y);
-    else if (element == EL_EXTRA_TIME)
-      DrawGraphicAnimation(x, y, IMG_EXTRA_TIME);
-    else if (element == EL_SHIELD_NORMAL)
-    {
-      DrawGraphicAnimation(x, y, IMG_SHIELD_NORMAL);
-
-#if 0
-      if (!(FrameCounter % 4))
-	PlaySoundLevel(x, y, SND_SHIELD_PASSIVE_ACTIVATED);
 #endif
-    }
-    else if (element == EL_SHIELD_DEADLY)
-    {
-      DrawGraphicAnimation(x, y, IMG_SHIELD_DEADLY);
 
-#if 0
-      if (!(FrameCounter % 4))
-	PlaySoundLevel(x, y, SND_SHIELD_DEADLY_ACTIVE);
+    else if (IS_AUTO_CHANGING(element))
+      ChangeElement(x, y);
+
+#if 1
+    else if (element == EL_EXPLOSION)
+      ;	/* drawing of correct explosion animation is handled separately */
+    else if (IS_ANIMATED(graphic))
+      DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
 #endif
-    }
+
+    if (IS_BELT_ACTIVE(element))
+      PlaySoundLevelAction(x, y, ACTION_ACTIVE);
 
     if (game.magic_wall_active)
     {
-      boolean sieb = FALSE;
       int jx = local_player->jx, jy = local_player->jy;
 
-      if (element == EL_MAGIC_WALL_FULL ||
-	  element == EL_MAGIC_WALL_ACTIVE ||
-	  element == EL_MAGIC_WALL_EMPTYING)
-      {
-	SiebAktivieren(x, y, 1);
-	sieb = TRUE;
-      }
-      else if (element == EL_BD_MAGIC_WALL_FULL ||
-	       element == EL_BD_MAGIC_WALL_ACTIVE ||
-	       element == EL_BD_MAGIC_WALL_EMPTYING)
-      {
-	SiebAktivieren(x, y, 2);
-	sieb = TRUE;
-      }
-
       /* play the element sound at the position nearest to the player */
-      if (sieb && ABS(x-jx)+ABS(y-jy) < ABS(sieb_x-jx)+ABS(sieb_y-jy))
+      if ((element == EL_MAGIC_WALL_FULL ||
+	   element == EL_MAGIC_WALL_ACTIVE ||
+	   element == EL_MAGIC_WALL_EMPTYING ||
+	   element == EL_BD_MAGIC_WALL_FULL ||
+	   element == EL_BD_MAGIC_WALL_ACTIVE ||
+	   element == EL_BD_MAGIC_WALL_EMPTYING) &&
+	  ABS(x-jx) + ABS(y-jy) < ABS(magic_wall_x-jx) + ABS(magic_wall_y-jy))
       {
-	sieb_x = x;
-	sieb_y = y;
+	magic_wall_x = x;
+	magic_wall_y = y;
       }
     }
   }
@@ -5024,7 +4734,7 @@ void GameActions()
       if (ExplodeField[x][y])
 	Explode(x, y, EX_PHASE_START, ExplodeField[x][y]);
       else if (element == EL_EXPLOSION)
-	Explode(x, y, Frame[x][y], EX_NORMAL);
+	Explode(x, y, ExplodePhase[x][y], EX_NORMAL);
 
       ExplodeField[x][y] = EX_NO_EXPLOSION;
     }
@@ -5036,14 +4746,14 @@ void GameActions()
   {
     if (!(game.magic_wall_time_left % 4))
     {
-      int element = Feld[sieb_x][sieb_y];
+      int element = Feld[magic_wall_x][magic_wall_y];
 
       if (element == EL_BD_MAGIC_WALL_FULL ||
 	  element == EL_BD_MAGIC_WALL_ACTIVE ||
 	  element == EL_BD_MAGIC_WALL_EMPTYING)
-	PlaySoundLevel(sieb_x, sieb_y, SND_BD_MAGIC_WALL_ACTIVE);
+	PlaySoundLevel(magic_wall_x, magic_wall_y, SND_BD_MAGIC_WALL_ACTIVE);
       else
-	PlaySoundLevel(sieb_x, sieb_y, SND_MAGIC_WALL_ACTIVE);
+	PlaySoundLevel(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE);
     }
 
     if (game.magic_wall_time_left > 0)
@@ -5131,14 +4841,14 @@ void GameActions()
       if (TimeLeft <= 10 && setup.time_limit)
 	PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, SOUND_MAX_RIGHT);
 
-      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2);
 
       if (!TimeLeft && setup.time_limit)
 	for (i=0; i<MAX_PLAYERS; i++)
 	  KillHero(&stored_player[i]);
     }
     else if (level.time == 0 && !AllPlayersGone) /* level without time limit */
-      DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
+      DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FONT_TEXT_2);
   }
 
   DrawAllPlayers();
@@ -5292,7 +5002,7 @@ boolean MoveFigureOneStep(struct PlayerInfo *player,
   {
     if (element == EL_ACID && dx == 0 && dy == 1)
     {
-      Blurb(jx, jy);
+      SplashAcid(jx, jy);
       Feld[jx][jy] = EL_PLAYER1;
       InitMovingField(jx, jy, MV_DOWN);
       Store[jx][jy] = EL_ACID;
@@ -5354,7 +5064,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     int original_move_delay_value = player->move_delay_value;
 
 #if DEBUG
-    printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES.\n");
+    printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES. [%ld]\n",
+	   tape.counter);
 #endif
 
     /* scroll remaining steps with finest movement resolution */
@@ -5455,13 +5166,13 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     }
   }
 
-  if (!(moved & MF_MOVING) && !player->Pushing)
-    player->Frame = 0;
-  else
 #if 0
-    player->Frame = (player->Frame + 1) % 4;
+#if 1
+  InitPlayerGfxAnimation(player, ACTION_DEFAULT);
 #else
-    player->Frame += 1 * 0;
+  if (!(moved & MF_MOVING) && !player->Pushing)
+    player->Frame = 0;
+#endif
 #endif
 
   if (moved & MF_MOVING)
@@ -5507,8 +5218,6 @@ void ScrollFigure(struct PlayerInfo *player, int mode)
   {
     player->actual_frame_counter = FrameCounter;
     player->GfxPos = move_stepsize * (player->MovPos / move_stepsize);
-    if (player->Frame)
-      player->Frame += 1;
 
     if (Feld[last_jx][last_jy] == EL_EMPTY)
       Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING;
@@ -5521,7 +5230,6 @@ void ScrollFigure(struct PlayerInfo *player, int mode)
 
   player->MovPos += (player->MovPos > 0 ? -1 : 1) * move_stepsize;
   player->GfxPos = move_stepsize * (player->MovPos / move_stepsize);
-  player->Frame += 1;
 
   if (Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING)
     Feld[last_jx][last_jy] = EL_EMPTY;
@@ -5886,6 +5594,8 @@ int DigField(struct PlayerInfo *player,
 			dy == +1 ? MV_DOWN : MV_NO_MOVING);
   int element;
 
+  player->is_digging = FALSE;
+
   if (player->MovPos == 0)
     player->Pushing = FALSE;
 
@@ -5940,8 +5650,9 @@ int DigField(struct PlayerInfo *player,
     case EL_TRAP:
     case EL_SP_BASE:
     case EL_SP_BUGGY_BASE:
+    case EL_SP_BUGGY_BASE_ACTIVATING:
       RemoveField(x, y);
-      PlaySoundLevelElementAction(x, y, element, SND_ACTION_DIGGING);
+      PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING);
       break;
 
     case EL_EMERALD:
@@ -5961,9 +5672,8 @@ int DigField(struct PlayerInfo *player,
 	local_player->gems_still_needed = 0;
       RaiseScoreElement(element);
       DrawText(DX_EMERALDS, DY_EMERALDS,
-	       int2str(local_player->gems_still_needed, 3),
-	       FS_SMALL, FC_YELLOW);
-      PlaySoundLevelElementAction(x, y, element, SND_ACTION_COLLECTING);
+	       int2str(local_player->gems_still_needed, 3), FONT_TEXT_2);
+      PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING);
       break;
 
     case EL_SPEED_PILL:
@@ -5982,7 +5692,7 @@ int DigField(struct PlayerInfo *player,
       if (level.time > 0)
       {
 	TimeLeft += 10;
-	DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+	DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2);
       }
       PlaySoundStereo(SND_EXTRA_TIME_COLLECTING, SOUND_MAX_RIGHT);
       break;
@@ -6004,11 +5714,11 @@ int DigField(struct PlayerInfo *player,
     case EL_SP_DISK_RED:
       RemoveField(x, y);
       player->dynamite++;
+      player->use_disk_red_graphic = (element == EL_SP_DISK_RED);
       RaiseScoreElement(EL_DYNAMITE);
-      DrawText(DX_DYNAMITE, DY_DYNAMITE,
-	       int2str(local_player->dynamite, 3),
-	       FS_SMALL, FC_YELLOW);
-      PlaySoundLevelElementAction(x, y, element, SND_ACTION_COLLECTING);
+      DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3),
+	       FONT_TEXT_2);
+      PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING);
       break;
 
     case EL_DYNABOMB_NR:
@@ -6039,14 +5749,15 @@ int DigField(struct PlayerInfo *player,
     case EL_KEY4:
     {
       int key_nr = element - EL_KEY1;
+      int graphic = el2edimg(element);
 
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
       RaiseScoreElement(element);
       DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1 + key_nr);
+			 graphic);
       DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1 + key_nr);
+			 graphic);
       PlaySoundLevel(x, y, SND_KEY_COLLECTING);
       break;
     }
@@ -6057,14 +5768,15 @@ int DigField(struct PlayerInfo *player,
     case EL_EM_KEY4:
     {
       int key_nr = element - EL_EM_KEY1;
+      int graphic = el2edimg(EL_KEY1 + key_nr);
 
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
       RaiseScoreElement(element);
       DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1 + key_nr);
+			 graphic);
       DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1 + key_nr);
+			 graphic);
       PlaySoundLevel(x, y, SND_KEY_COLLECTING);
       break;
     }
@@ -6180,7 +5892,9 @@ int DigField(struct PlayerInfo *player,
     case EL_SPRING:
       if (mode == DF_SNAP)
 	return MF_NO_ACTION;
+
       /* no "break" -- fall through to next case */
+
       /* the following elements can be pushed by "snapping" */
     case EL_BD_ROCK:
       if (dy)
@@ -6201,7 +5915,8 @@ int DigField(struct PlayerInfo *player,
 	player->push_delay = FrameCounter;
 #if 0
       if (!FrameReached(&player->push_delay, player->push_delay_value) &&
-	  !tape.playing && element != EL_SPRING)
+	  !tape.playing &&
+	  element != EL_SPRING)
 	return MF_NO_ACTION;
 #else
       if (!FrameReached(&player->push_delay, player->push_delay_value) &&
@@ -6218,19 +5933,19 @@ int DigField(struct PlayerInfo *player,
       else
       {
 	RemoveField(x, y);
-	Feld[x+dx][y+dy] = element;
+	Feld[x + dx][y + dy] = element;
       }
 
       if (element == EL_SPRING)
       {
-	Feld[x+dx][y+dy] = EL_SPRING_MOVING;
-	MovDir[x+dx][y+dy] = move_direction;
+	Feld[x + dx][y + dy] = EL_SPRING;
+	MovDir[x + dx][y + dy] = move_direction;
       }
 
       player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));
 
       DrawLevelField(x + dx, y + dy);
-      PlaySoundLevelElementAction(x, y, element, SND_ACTION_PUSHING);
+      PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
       break;
 
     case EL_GATE1:
@@ -6290,7 +6005,7 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-      PlaySoundLevelElementAction(x, y, element, SND_ACTION_PASSING);
+      PlaySoundLevelElementAction(x, y, element, ACTION_PASSING);
       break;
 
     case EL_SP_PORT1_LEFT:
@@ -6407,7 +6122,7 @@ int DigField(struct PlayerInfo *player,
     case EL_TIME_ORB_FULL:
       Feld[x][y] = EL_TIME_ORB_EMPTY;
       TimeLeft += 10;
-      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2);
       DrawLevelField(x, y);
       PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, SOUND_MAX_RIGHT);
       return MF_ACTION;
@@ -6488,7 +6203,7 @@ int DigField(struct PlayerInfo *player,
       {
 	RemoveField(x, y);
 	Feld[x+dx][y+dy] = element;
-	PlaySoundLevelElementAction(x, y, element, SND_ACTION_PUSHING);
+	PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
       }
 
       player->push_delay_value = (element == EL_BALLOON ? 0 : 2);
@@ -6512,11 +6227,56 @@ int DigField(struct PlayerInfo *player,
       break;
 
     default:
+      if (IS_PUSHABLE(element))
+      {
+	if (mode == DF_SNAP)
+	  return MF_NO_ACTION;
+
+	if (CAN_FALL(element) && dy)
+	  return MF_NO_ACTION;
+
+	player->Pushing = TRUE;
+
+	if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy))
+	  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 && tape.file_version < FILE_VERSION_2_0))
+	  return MF_NO_ACTION;
+
+	RemoveField(x, y);
+	Feld[x + dx][y + dy] = element;
+
+	player->push_delay_value = 2 + RND(8);
+
+	DrawLevelField(x + dx, y + dy);
+	PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
+
+	break;
+      }
+
       return MF_NO_ACTION;
   }
 
   player->push_delay = 0;
 
+  if (Feld[x][y] != element)		/* really digged something */
+    player->is_digging = TRUE;
+
   return MF_MOVING;
 }
 
@@ -6537,6 +6297,7 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy)
       player->Pushing = FALSE;
 
     player->snapped = FALSE;
+    player->is_digging = FALSE;
     return FALSE;
   }
 
@@ -6552,6 +6313,7 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy)
     return FALSE;
 
   player->snapped = TRUE;
+  player->is_digging = FALSE;
   DrawLevelField(x, y);
   BackToFront();
 
@@ -6575,19 +6337,29 @@ boolean PlaceBomb(struct PlayerInfo *player)
   if (element != EL_EMPTY)
     Store[jx][jy] = element;
 
+  MovDelay[jx][jy] = 96;
+
+  ResetGfxAnimation(jx, jy);
+  ResetRandomAnimationValue(jx, jy);
+
   if (player->dynamite)
   {
-    Feld[jx][jy] = EL_DYNAMITE_ACTIVE;
-    MovDelay[jx][jy] = 96;
+    Feld[jx][jy] = (player->use_disk_red_graphic ? EL_SP_DISK_RED_ACTIVE :
+		    EL_DYNAMITE_ACTIVE);
     player->dynamite--;
+
     DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3),
-	     FS_SMALL, FC_YELLOW);
+	     FONT_TEXT_2);
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
     {
+#if 1
+      DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0);
+#else
       if (game.emulation == EMU_SUPAPLEX)
 	DrawGraphic(SCREENX(jx), SCREENY(jy), IMG_SP_DISK_RED, 0);
       else
 	DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), IMG_DYNAMITE_ACTIVE, 0);
+#endif
     }
 
     PlaySoundLevel(jx, jy, SND_DYNAMITE_DROPPING);
@@ -6596,8 +6368,8 @@ boolean PlaceBomb(struct PlayerInfo *player)
   {
     Feld[jx][jy] =
       EL_DYNABOMB_PLAYER1_ACTIVE + (player->element_nr - EL_PLAYER1);
-    MovDelay[jx][jy] = 96;
     player->dynabombs_left--;
+
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
       DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0);
 
@@ -6607,10 +6379,29 @@ boolean PlaceBomb(struct PlayerInfo *player)
   return TRUE;
 }
 
-void PlaySoundLevel(int x, int y, int nr)
+/* ------------------------------------------------------------------------- */
+/* game sound playing functions                                              */
+/* ------------------------------------------------------------------------- */
+
+static int *loop_sound_frame = NULL;
+static int *loop_sound_volume = NULL;
+
+void InitPlaySoundLevel()
+{
+  int num_sounds = getSoundListSize();
+
+  if (loop_sound_frame != NULL)
+    free(loop_sound_frame);
+
+  if (loop_sound_volume != NULL)
+    free(loop_sound_volume);
+
+  loop_sound_frame = checked_calloc(num_sounds * sizeof(int));
+  loop_sound_volume = checked_calloc(num_sounds * sizeof(int));
+}
+
+static void PlaySoundLevel(int x, int y, int nr)
 {
-  static int loop_sound_frame[NUM_SOUND_FILES];
-  static int loop_sound_volume[NUM_SOUND_FILES];
   int sx = SCREENX(x), sy = SCREENY(y);
   int volume, stereo_position;
   int max_distance = 8;
@@ -6654,24 +6445,33 @@ void PlaySoundLevel(int x, int y, int nr)
   PlaySoundExt(nr, volume, stereo_position, type);
 }
 
-void PlaySoundLevelAction(int x, int y, int sound_action)
+static void PlaySoundLevelNearest(int x, int y, int sound_action)
+{
+  PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) :
+		 x > LEVELX(BX2) ? LEVELX(BX2) : x,
+		 y < LEVELY(BY1) ? LEVELY(BY1) :
+		 y > LEVELY(BY2) ? LEVELY(BY2) : y,
+		 sound_action);
+}
+
+static void PlaySoundLevelAction(int x, int y, int sound_action)
 {
   PlaySoundLevelElementAction(x, y, Feld[x][y], sound_action);
 }
 
-void PlaySoundLevelElementAction(int x, int y, int element, int sound_action)
+static void PlaySoundLevelElementAction(int x, int y, int element,
+					int sound_action)
 {
-  int sound_effect = element_action_sound[element][sound_action];
+  int sound_effect = element_info[element].sound[sound_action];
 
-  if (sound_effect != -1)
+  if (sound_effect != SND_UNDEFINED)
     PlaySoundLevel(x, y, sound_effect);
 }
 
 void RaiseScore(int value)
 {
   local_player->score += value;
-  DrawText(DX_SCORE, DY_SCORE, int2str(local_player->score, 5),
-	   FS_SMALL, FC_YELLOW);
+  DrawText(DX_SCORE, DY_SCORE, int2str(local_player->score, 5), FONT_TEXT_2);
 }
 
 void RaiseScoreElement(int element)
@@ -6810,7 +6610,7 @@ void CreateGameButtons()
 
   for (i=0; i<NUM_GAME_BUTTONS; i++)
   {
-    Bitmap *gd_bitmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     struct GadgetInfo *gi;
     int button_type;
     boolean checked;
@@ -6870,6 +6670,14 @@ void CreateGameButtons()
   }
 }
 
+void FreeGameButtons()
+{
+  int i;
+
+  for (i=0; i<NUM_GAME_BUTTONS; i++)
+    FreeGadget(game_gadget[i]);
+}
+
 static void MapGameButtons()
 {
   int i;