X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=36e0701e22d50f6470e77b199c934ffa4857c5dd;hb=2a357b702b5ceb9bf9173ac02f68cf42340b3158;hp=3bb6aa59dde50c6492f5a797839b4fbdbc97267e;hpb=30cc9a5cf3f338d51fd1bd45a2c3af22c416cd03;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 3bb6aa59..36e0701e 100644
--- a/src/game.c
+++ b/src/game.c
@@ -182,12 +182,14 @@ static boolean CheckTriggeredElementChange(int, int, int, int);
 static boolean CheckElementSideChange(int, int, int, int, int, int);
 static boolean CheckElementChange(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 PlaySoundLevelActionIfLoop(int, int, int);
-static void StopSoundLevelActionIfLoop(int, int, int);
+static void PlayLevelSound(int, int, int);
+static void PlayLevelSoundNearest(int, int, int);
+static void PlayLevelSoundAction(int, int, int);
+static void PlayLevelSoundElementAction(int, int, int, int);
+static void PlayLevelSoundElementActionIfLoop(int, int, int, int);
+static void PlayLevelSoundActionIfLoop(int, int, int);
+static void StopLevelSoundActionIfLoop(int, int, int);
+static void PlayLevelMusic();
 
 static void MapGameButtons();
 static void HandleGameButtons(struct GadgetInfo *);
@@ -679,7 +681,7 @@ static void InitField(int x, int y, boolean init_game)
 
     case EL_PIG:
     case EL_DRAGON:
-      MovDir[x][y] = 1 << RND(4);
+      GfxDir[x][y] = MovDir[x][y] = 1 << RND(4);
       break;
 
 #if 0
@@ -754,8 +756,8 @@ void DrawGameDoorValues()
 {
   int i, j;
 
-  for (i=0; i<MAX_PLAYERS; i++)
-    for (j=0; j<4; j++)
+  for (i = 0; i < MAX_PLAYERS; i++)
+    for (j = 0; j < 4; j++)
       if (stored_player[i].key[j])
 	DrawMiniGraphicExt(drawto, DX_KEYS + j * MINI_TILEX, DY_KEYS,
 			   el2edimg(EL_KEY_1 + j));
@@ -818,7 +820,7 @@ static void InitGameEngine()
   /* ---------- initialize changing elements ------------------------------- */
 
   /* initialize changing elements information */
-  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     struct ElementInfo *ei = &element_info[i];
 
@@ -834,7 +836,7 @@ static void InitGameEngine()
     }
 
     ei->change_events = CE_BITMASK_DEFAULT;
-    for (j=0; j < NUM_CHANGE_EVENTS; j++)
+    for (j = 0; j < NUM_CHANGE_EVENTS; j++)
     {
       ei->event_page_nr[j] = 0;
       ei->event_page[j] = &ei->change_page[0];
@@ -842,7 +844,7 @@ static void InitGameEngine()
   }
 
   /* add changing elements from pre-defined list */
-  for (i=0; change_delay_list[i].element != EL_UNDEFINED; i++)
+  for (i = 0; change_delay_list[i].element != EL_UNDEFINED; i++)
   {
     struct ChangingElementInfo *ch_delay = &change_delay_list[i];
     struct ElementInfo *ei = &element_info[ch_delay->element];
@@ -859,16 +861,16 @@ static void InitGameEngine()
 
 #if 1
   /* add change events from custom element configuration */
-  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
     struct ElementInfo *ei = &element_info[EL_CUSTOM_START + i];
 
-    for (j=0; j < ei->num_change_pages; j++)
+    for (j = 0; j < ei->num_change_pages; j++)
     {
       if (!ei->change_page[j].can_change)
 	continue;
 
-      for (k=0; k < NUM_CHANGE_EVENTS; k++)
+      for (k = 0; k < NUM_CHANGE_EVENTS; k++)
       {
 	/* only add event page for the first page found with this event */
 	if (ei->change_page[j].events & CH_EVENT_BIT(k) &&
@@ -885,7 +887,7 @@ static void InitGameEngine()
 #else
 
   /* add change events from custom element configuration */
-  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
     int element = EL_CUSTOM_START + i;
 
@@ -898,16 +900,16 @@ static void InitGameEngine()
   /* ---------- initialize trigger events ---------------------------------- */
 
   /* initialize trigger events information */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     trigger_events[i] = EP_BITMASK_DEFAULT;
 
 #if 1
   /* add trigger events from element change event properties */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     struct ElementInfo *ei = &element_info[i];
 
-    for (j=0; j < ei->num_change_pages; j++)
+    for (j = 0; j < ei->num_change_pages; j++)
     {
       if (!ei->change_page[j].can_change)
 	continue;
@@ -922,7 +924,7 @@ static void InitGameEngine()
   }
 #else
   /* add trigger events from element change event properties */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (HAS_CHANGE_EVENT(i, CE_BY_OTHER_ACTION))
       trigger_events[element_info[i].change->trigger_element] |=
 	element_info[i].change->events;
@@ -931,7 +933,7 @@ static void InitGameEngine()
   /* ---------- initialize push delay -------------------------------------- */
 
   /* initialize push delay values to default */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     if (!IS_CUSTOM_ELEMENT(i))
     {
@@ -941,7 +943,7 @@ static void InitGameEngine()
   }
 
   /* set push delay value for certain elements from pre-defined list */
-  for (i=0; push_delay_list[i].element != EL_UNDEFINED; i++)
+  for (i = 0; push_delay_list[i].element != EL_UNDEFINED; i++)
   {
     int e = push_delay_list[i].element;
 
@@ -952,12 +954,12 @@ static void InitGameEngine()
   /* ---------- initialize move stepsize ----------------------------------- */
 
   /* initialize move stepsize values to default */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (!IS_CUSTOM_ELEMENT(i))
       element_info[i].move_stepsize = MOVE_STEPSIZE_NORMAL;
 
   /* set move stepsize value for certain elements from pre-defined list */
-  for (i=0; move_stepsize_list[i].element != EL_UNDEFINED; i++)
+  for (i = 0; move_stepsize_list[i].element != EL_UNDEFINED; i++)
   {
     int e = move_stepsize_list[i].element;
 
@@ -967,12 +969,12 @@ static void InitGameEngine()
   /* ---------- initialize gem count --------------------------------------- */
 
   /* initialize gem count values for each element */
-  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (!IS_CUSTOM_ELEMENT(i))
       element_info[i].collect_count = 0;
 
   /* add gem count values for all elements from pre-defined list */
-  for (i=0; collect_count_list[i].element != EL_UNDEFINED; i++)
+  for (i = 0; collect_count_list[i].element != EL_UNDEFINED; i++)
     element_info[collect_count_list[i].element].collect_count =
       collect_count_list[i].count;
 }
@@ -991,7 +993,7 @@ void InitGame()
   boolean emulate_bd = TRUE;	/* unless non-BOULDERDASH elements found */
   boolean emulate_sb = TRUE;	/* unless non-SOKOBAN     elements found */
   boolean emulate_sp = TRUE;	/* unless non-SUPAPLEX    elements found */
-  int i, j, x, y;
+  int i, j, k, x, y;
 
   InitGameEngine();
 
@@ -1008,7 +1010,7 @@ void InitGame()
   /* don't play tapes over network */
   network_playing = (options.network && !tape.playing);
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
 
@@ -1028,7 +1030,7 @@ void InitGame()
     player->lights_still_needed = 0;
     player->friends_still_needed = 0;
 
-    for (j=0; j<4; j++)
+    for (j = 0; j < 4; j++)
       player->key[j] = FALSE;
 
     player->dynabomb_count = 0;
@@ -1058,6 +1060,51 @@ void InitGame()
     player->is_pushing = FALSE;
     player->is_switching = FALSE;
 
+    player->is_bored = FALSE;
+    player->is_sleeping = FALSE;
+
+    player->frame_counter_bored = -1;
+    player->frame_counter_sleeping = -1;
+
+    player->anim_delay_counter = 0;
+    player->post_delay_counter = 0;
+
+    player->special_action_bored = ACTION_DEFAULT;
+    player->special_action_sleeping = ACTION_DEFAULT;
+
+    player->num_special_action_bored = 0;
+    player->num_special_action_sleeping = 0;
+
+    /* determine number of special actions for bored and sleeping animation */
+    for (j = ACTION_BORING_1; j <= ACTION_BORING_LAST; j++)
+    {
+      boolean found = FALSE;
+
+      for (k = 0; k < NUM_DIRECTIONS; k++)
+	if (el_act_dir2img(player->element_nr, j, k) !=
+	    el_act_dir2img(player->element_nr, ACTION_DEFAULT, k))
+	  found = TRUE;
+
+      if (found)
+	player->num_special_action_bored++;
+      else
+	break;
+    }
+    for (j = ACTION_SLEEPING_1; j <= ACTION_SLEEPING_LAST; j++)
+    {
+      boolean found = FALSE;
+
+      for (k = 0; k < NUM_DIRECTIONS; k++)
+	if (el_act_dir2img(player->element_nr, j, k) !=
+	    el_act_dir2img(player->element_nr, ACTION_DEFAULT, k))
+	  found = TRUE;
+
+      if (found)
+	player->num_special_action_sleeping++;
+      else
+	break;
+    }
+
     player->switch_x = -1;
     player->switch_y = -1;
 
@@ -1119,18 +1166,18 @@ void InitGame()
 
   game.envelope_active = FALSE;
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     game.belt_dir[i] = MV_NO_MOVING;
     game.belt_dir_nr[i] = 3;		/* not moving, next moving left */
   }
 
-  for (i=0; i<MAX_NUM_AMOEBA; i++)
+  for (i = 0; i < MAX_NUM_AMOEBA; i++)
     AmoebaCnt[i] = AmoebaCnt2[i] = 0;
 
-  for (x=0; x<lev_fieldx; x++)
+  for (x = 0; x < lev_fieldx; x++)
   {
-    for (y=0; y<lev_fieldy; y++)
+    for (y = 0; y < lev_fieldy; y++)
     {
       Feld[x][y] = level.field[x][y];
       MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
@@ -1150,15 +1197,16 @@ void InitGame()
       ExplodeField[x][y] = EX_NO_EXPLOSION;
 
       GfxFrame[x][y] = 0;
-      GfxAction[x][y] = ACTION_DEFAULT;
       GfxRandom[x][y] = INIT_GFX_RANDOM();
       GfxElement[x][y] = EL_UNDEFINED;
+      GfxAction[x][y] = ACTION_DEFAULT;
+      GfxDir[x][y] = MV_NO_MOVING;
     }
   }
 
-  for(y=0; y<lev_fieldy; y++)
+  for (y = 0; y < lev_fieldy; y++)
   {
-    for(x=0; x<lev_fieldx; x++)
+    for (x = 0; x < lev_fieldx; x++)
     {
       if (emulate_bd && !IS_BD_ELEMENT(Feld[x][y]))
 	emulate_bd = FALSE;
@@ -1178,18 +1226,18 @@ void InitGame()
 		    emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
 
   /* correct non-moving belts to start moving left */
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
     if (game.belt_dir[i] == MV_NO_MOVING)
       game.belt_dir_nr[i] = 3;		/* not moving, next moving left */
 
   /* check if any connected player was not found in playfield */
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
 
     if (player->connected && !player->present)
     {
-      for (j=0; j<MAX_PLAYERS; j++)
+      for (j = 0; j < MAX_PLAYERS; j++)
       {
 	struct PlayerInfo *some_player = &stored_player[j];
 	int jx = some_player->jx, jy = some_player->jy;
@@ -1215,7 +1263,7 @@ void InitGame()
   {
     /* when playing a tape, eliminate all players who do not participate */
 
-    for (i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
       if (stored_player[i].active && !tape.player_participates[i])
       {
@@ -1232,11 +1280,11 @@ void InitGame()
   {
     /* when in single player mode, eliminate all but the first active player */
 
-    for (i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
       if (stored_player[i].active)
       {
-	for (j=i+1; j<MAX_PLAYERS; j++)
+	for (j = i + 1; j < MAX_PLAYERS; j++)
 	{
 	  if (stored_player[j].active)
 	  {
@@ -1255,14 +1303,14 @@ void InitGame()
   /* when recording the game, store which players take part in the game */
   if (tape.recording)
   {
-    for (i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
       if (stored_player[i].active)
 	tape.player_participates[i] = TRUE;
   }
 
   if (options.debug)
   {
-    for (i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
       struct PlayerInfo *player = &stored_player[i];
 
@@ -1305,7 +1353,7 @@ void InitGame()
     int found_rating = 0;
     int found_element = EL_UNDEFINED;
 
-    for(y=0; y < lev_fieldy; y++) for(x=0; x < lev_fieldx; x++)
+    for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
     {
       int element = Feld[x][y];
       int content;
@@ -1317,7 +1365,7 @@ void InitGame()
 
       if (CAN_CHANGE(element))
       {
-	for (i=0; i < element_info[element].num_change_pages; i++)
+	for (i = 0; i < element_info[element].num_change_pages; i++)
 	{
 	  content = element_info[element].change_page[i].target_element;
 	  is_player = ELEM_IS_PLAYER(content);
@@ -1333,7 +1381,7 @@ void InitGame()
 	}
       }
 
-      for(yy=0; yy < 3; yy++) for(xx=0; xx < 3; xx++)
+      for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3; xx++)
       {
 	content = element_info[element].content[xx][yy];
 	is_player = ELEM_IS_PLAYER(content);
@@ -1350,7 +1398,7 @@ void InitGame()
 	if (!CAN_CHANGE(element))
 	  continue;
 
-	for (i=0; i < element_info[element].num_change_pages; i++)
+	for (i = 0; i < element_info[element].num_change_pages; i++)
 	{
 	  content = element_info[element].change_page[i].content[xx][yy];
 	  is_player = ELEM_IS_PLAYER(content);
@@ -1448,17 +1496,22 @@ void InitGame()
   OpenDoor(DOOR_OPEN_ALL);
 
   PlaySoundStereo(SND_GAME_STARTING, SOUND_MIDDLE);
+
   if (setup.sound_music)
-    PlayMusic(level_nr);
+    PlayLevelMusic();
 
   KeyboardAutoRepeatOffUnlessAutoplay();
 
   if (options.debug)
   {
-    for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++)
       printf("Player %d %sactive.\n",
 	     i + 1, (stored_player[i].active ? "" : "not "));
   }
+
+#if 0
+  printf("::: starting game [%d]\n", FrameCounter);
+#endif
 }
 
 void InitMovDir(int x, int y)
@@ -1554,7 +1607,7 @@ void InitMovDir(int x, int y)
 	else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE ||
 		 element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE)
 	{
-	  for (i=0; i<4; i++)
+	  for (i = 0; i < 4; i++)
 	  {
 	    int x1 = x + xy[i][0];
 	    int y1 = y + xy[i][1];
@@ -1581,7 +1634,7 @@ void InitMovDir(int x, int y)
 	    element != EL_BD_FIREFLY)
 	  break;
 
-	for (i=0; i<4; i++)
+	for (i = 0; i < 4; i++)
 	{
 	  int x1 = x + xy[i][0];
 	  int y1 = y + xy[i][1];
@@ -1604,6 +1657,8 @@ void InitMovDir(int x, int y)
       }
       break;
   }
+
+  GfxDir[x][y] = MovDir[x][y];
 }
 
 void InitAmoebaNr(int x, int y)
@@ -1613,7 +1668,7 @@ void InitAmoebaNr(int x, int y)
 
   if (group_nr == 0)
   {
-    for (i=1; i<MAX_NUM_AMOEBA; i++)
+    for (i = 1; i < MAX_NUM_AMOEBA; i++)
     {
       if (AmoebaCnt[i] == 0)
       {
@@ -1710,7 +1765,7 @@ void GameWon()
     Feld[ExitX][ExitY] = (element == EL_EXIT_OPEN ? EL_EXIT_CLOSING :
 			  EL_SP_EXIT_CLOSING);
 
-    PlaySoundLevelElementAction(ExitX, ExitY, element, ACTION_CLOSING);
+    PlayLevelSoundElementAction(ExitX, ExitY, element, ACTION_CLOSING);
   }
 
   /* Hero disappears */
@@ -1774,7 +1829,7 @@ int NewHiScore()
       local_player->score < highscore[MAX_SCORE_ENTRIES - 1].Score) 
     return -1;
 
-  for (k=0; k<MAX_SCORE_ENTRIES; k++) 
+  for (k = 0; k < MAX_SCORE_ENTRIES; k++) 
   {
     if (local_player->score > highscore[k].Score)
     {
@@ -1785,14 +1840,14 @@ int NewHiScore()
 	int m = MAX_SCORE_ENTRIES - 1;
 
 #ifdef ONE_PER_NAME
-	for (l=k; l<MAX_SCORE_ENTRIES; l++)
+	for (l = k; l < MAX_SCORE_ENTRIES; l++)
 	  if (!strcmp(setup.player_name, highscore[l].Name))
 	    m = l;
 	if (m == k)	/* player's new highscore overwrites his old one */
 	  goto put_into_list;
 #endif
 
-	for (l=m; l>k; l--)
+	for (l = m; l > k; l--)
 	{
 	  strcpy(highscore[l].Name, highscore[l - 1].Name);
 	  highscore[l].Score = highscore[l - 1].Score;
@@ -1848,6 +1903,7 @@ static void ResetGfxAnimation(int x, int y)
 {
   GfxFrame[x][y] = 0;
   GfxAction[x][y] = ACTION_DEFAULT;
+  GfxDir[x][y] = MovDir[x][y];
 }
 
 void InitMovingField(int x, int y, int direction)
@@ -1862,6 +1918,7 @@ void InitMovingField(int x, int y, int direction)
     ResetGfxAnimation(x, y);
 
   MovDir[newx][newy] = MovDir[x][y] = direction;
+  GfxDir[x][y] = direction;
 
   if (Feld[newx][newy] == EL_EMPTY)
     Feld[newx][newy] = EL_BLOCKED;
@@ -1872,8 +1929,9 @@ void InitMovingField(int x, int y, int direction)
     GfxAction[x][y] = ACTION_MOVING;
 
   GfxFrame[newx][newy] = GfxFrame[x][y];
-  GfxAction[newx][newy] = GfxAction[x][y];
   GfxRandom[newx][newy] = GfxRandom[x][y];
+  GfxAction[newx][newy] = GfxAction[x][y];
+  GfxDir[newx][newy] = GfxDir[x][y];
 }
 
 void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
@@ -1957,6 +2015,7 @@ static void RemoveField(int x, int y)
 
   GfxElement[x][y] = EL_UNDEFINED;
   GfxAction[x][y] = ACTION_DEFAULT;
+  GfxDir[x][y] = MV_NO_MOVING;
 }
 
 void RemoveMovingField(int x, int y)
@@ -2043,14 +2102,14 @@ void CheckDynamite(int x, int y)
     if (MovDelay[x][y] != 0)
     {
       DrawDynamite(x, y);
-      PlaySoundLevelActionIfLoop(x, y, ACTION_ACTIVE);
+      PlayLevelSoundActionIfLoop(x, y, ACTION_ACTIVE);
 
       return;
     }
   }
 
 #if 1
-  StopSoundLevelActionIfLoop(x, y, ACTION_ACTIVE);
+  StopLevelSoundActionIfLoop(x, y, ACTION_ACTIVE);
 #else
   if (Feld[x][y] == EL_DYNAMITE_ACTIVE ||
       Feld[x][y] == EL_SP_DISK_RED_ACTIVE)
@@ -2163,7 +2222,7 @@ void Explode(int ex, int ey, int phase, int mode)
 #endif
 
     if (mode == EX_NORMAL || mode == EX_CENTER)
-      PlaySoundLevelAction(ex, ey, ACTION_EXPLODING);
+      PlayLevelSoundAction(ex, ey, ACTION_EXPLODING);
 
     /* remove things displayed in background while burning dynamite */
     if (Back[ex][ey] != EL_EMPTY && !IS_INDESTRUCTIBLE(Back[ex][ey]))
@@ -2177,7 +2236,7 @@ void Explode(int ex, int ey, int phase, int mode)
       Feld[ex][ey] = center_element;
     }
 
-    for (y = ey - 1; y <= ey + 1; y++) for(x = ex - 1; x <= ex + 1; x++)
+    for (y = ey - 1; y <= ey + 1; y++) for (x = ex - 1; x <= ex + 1; x++)
     {
       int xx = x - ex + 1;
       int yy = y - ey + 1;
@@ -2334,6 +2393,7 @@ void Explode(int ex, int ey, int phase, int mode)
       RemoveField(x, y);
 #else
       MovDir[x][y] = MovPos[x][y] = 0;
+      GfxDir[x][y] = MovDir[x][y];
       AmoebaNr[x][y] = 0;
 #endif
 #endif
@@ -2422,6 +2482,7 @@ void Explode(int ex, int ey, int phase, int mode)
     Back[x][y] = 0;
 
     MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = 0;
+    GfxDir[x][y] = MV_NO_MOVING;
     ChangeDelay[x][y] = 0;
     ChangePage[x][y] = -1;
 
@@ -2495,9 +2556,9 @@ void DynaExplode(int ex, int ey)
 
   Explode(ex, ey, EX_PHASE_START, EX_CENTER);
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
-    for (j=1; j<=dynabomb_size; j++)
+    for (j = 1; j <= dynabomb_size; j++)
     {
       int x = ex + j * xy[i % 4][0];
       int y = ey + j * xy[i % 4][1];
@@ -2546,12 +2607,12 @@ void Bang(int x, int y)
 
 #if 0
 #if 1
-  PlaySoundLevelAction(x, y, ACTION_EXPLODING);
+  PlayLevelSoundAction(x, y, ACTION_EXPLODING);
 #else
   if (game.emulation == EMU_SUPAPLEX)
-    PlaySoundLevel(x, y, SND_SP_ELEMENT_EXPLODING);
+    PlayLevelSound(x, y, SND_SP_ELEMENT_EXPLODING);
   else
-    PlaySoundLevel(x, y, SND_ELEMENT_EXPLODING);
+    PlayLevelSound(x, y, SND_ELEMENT_EXPLODING);
 #endif
 #endif
 
@@ -2609,7 +2670,7 @@ void SplashAcid(int x, int y)
   if (element != EL_ACID_SPLASH_LEFT &&
       element != EL_ACID_SPLASH_RIGHT)
   {
-    PlaySoundLevel(x, y, SND_ACID_SPLASHING);
+    PlayLevelSound(x, y, SND_ACID_SPLASHING);
 
     if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) &&
 	(!IN_LEV_FIELD(x-1, y-1) ||
@@ -2643,11 +2704,11 @@ static void InitBeltMovement()
   int x, y, i, j;
 
   /* set frame order for belt animation graphic according to belt direction */
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int belt_nr = i;
 
-    for (j=0; j<3; j++)
+    for (j = 0; j < 3; j++)
     {
       int element = belt_base_active_element[belt_nr] + j;
       int graphic = el2img(element);
@@ -2659,13 +2720,13 @@ static void InitBeltMovement()
     }
   }
 
-  for(y=0; y<lev_fieldy; y++)
+  for (y = 0; y < lev_fieldy; y++)
   {
-    for(x=0; x<lev_fieldx; x++)
+    for (x = 0; x < lev_fieldx; x++)
     {
       int element = Feld[x][y];
 
-      for (i=0; i<4; i++)
+      for (i = 0; i < 4; i++)
       {
 	if (IS_BELT(element) && game.belt_dir[i] != MV_NO_MOVING)
 	{
@@ -2731,7 +2792,7 @@ static void ToggleBeltSwitch(int x, int y)
     belt_dir_nr = 1;
 
   /* set frame order for belt animation graphic according to belt direction */
-  for (i=0; i<3; i++)
+  for (i = 0; i < 3; i++)
   {
     int element = belt_base_active_element[belt_nr] + i;
     int graphic = el2img(element);
@@ -2742,9 +2803,9 @@ static void ToggleBeltSwitch(int x, int y)
       graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
   }
 
-  for (yy=0; yy<lev_fieldy; yy++)
+  for (yy = 0; yy < lev_fieldy; yy++)
   {
-    for (xx=0; xx<lev_fieldx; xx++)
+    for (xx = 0; xx < lev_fieldx; xx++)
     {
       int element = Feld[xx][yy];
 
@@ -2792,9 +2853,9 @@ static void ToggleSwitchgateSwitch(int x, int y)
 
   game.switchgate_pos = !game.switchgate_pos;
 
-  for (yy=0; yy<lev_fieldy; yy++)
+  for (yy = 0; yy < lev_fieldy; yy++)
   {
-    for (xx=0; xx<lev_fieldx; xx++)
+    for (xx = 0; xx < lev_fieldx; xx++)
     {
       int element = Feld[xx][yy];
 
@@ -2809,9 +2870,9 @@ static void ToggleSwitchgateSwitch(int x, int y)
       {
 	Feld[xx][yy] = EL_SWITCHGATE_CLOSING;
 #if 1
-	PlaySoundLevelAction(xx, yy, ACTION_CLOSING);
+	PlayLevelSoundAction(xx, yy, ACTION_CLOSING);
 #else
-	PlaySoundLevel(xx, yy, SND_SWITCHGATE_CLOSING);
+	PlayLevelSound(xx, yy, SND_SWITCHGATE_CLOSING);
 #endif
       }
       else if (element == EL_SWITCHGATE_CLOSED ||
@@ -2819,9 +2880,9 @@ static void ToggleSwitchgateSwitch(int x, int y)
       {
 	Feld[xx][yy] = EL_SWITCHGATE_OPENING;
 #if 1
-	PlaySoundLevelAction(xx, yy, ACTION_OPENING);
+	PlayLevelSoundAction(xx, yy, ACTION_OPENING);
 #else
-	PlaySoundLevel(xx, yy, SND_SWITCHGATE_OPENING);
+	PlayLevelSound(xx, yy, SND_SWITCHGATE_OPENING);
 #endif
       }
     }
@@ -2848,9 +2909,9 @@ static void RedrawAllLightSwitchesAndInvisibleElements()
 {
   int x, y;
 
-  for (y=0; y<lev_fieldy; y++)
+  for (y = 0; y < lev_fieldy; y++)
   {
-    for (x=0; x<lev_fieldx; x++)
+    for (x = 0; x < lev_fieldx; x++)
     {
       int element = Feld[x][y];
 
@@ -2905,9 +2966,9 @@ static void ActivateTimegateSwitch(int x, int y)
 
   game.timegate_time_left = level.time_timegate * FRAMES_PER_SECOND;
 
-  for (yy=0; yy<lev_fieldy; yy++)
+  for (yy = 0; yy < lev_fieldy; yy++)
   {
-    for (xx=0; xx<lev_fieldx; xx++)
+    for (xx = 0; xx < lev_fieldx; xx++)
     {
       int element = Feld[xx][yy];
 
@@ -2915,7 +2976,7 @@ static void ActivateTimegateSwitch(int x, int y)
 	  element == EL_TIMEGATE_CLOSING)
       {
 	Feld[xx][yy] = EL_TIMEGATE_OPENING;
-	PlaySoundLevel(xx, yy, SND_TIMEGATE_OPENING);
+	PlayLevelSound(xx, yy, SND_TIMEGATE_OPENING);
       }
 
       /*
@@ -3005,12 +3066,12 @@ void Impact(int x, int y)
   else if (impact && element == EL_PEARL)
   {
     Feld[x][y] = EL_PEARL_BREAKING;
-    PlaySoundLevel(x, y, SND_PEARL_BREAKING);
+    PlayLevelSound(x, y, SND_PEARL_BREAKING);
     return;
   }
   else if (impact && CheckElementChange(x, y, element, CE_IMPACT))
   {
-    PlaySoundLevelElementAction(x, y, element, ACTION_IMPACT);
+    PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
 
     return;
   }
@@ -3043,15 +3104,15 @@ void Impact(int x, int y)
 	 EL_BD_MAGIC_WALL_ACTIVE);
 
       /* activate magic wall / mill */
-      for (yy=0; yy<lev_fieldy; yy++)
-	for (xx=0; xx<lev_fieldx; xx++)
+      for (yy = 0; yy < lev_fieldy; yy++)
+	for (xx = 0; xx < lev_fieldx; xx++)
 	  if (Feld[xx][yy] == smashed)
 	    Feld[xx][yy] = activated_magic_wall;
 
       game.magic_wall_time_left = level.time_magic_wall * FRAMES_PER_SECOND;
       game.magic_wall_active = TRUE;
 
-      PlaySoundLevel(x, y, (smashed == EL_MAGIC_WALL ?
+      PlayLevelSound(x, y, (smashed == EL_MAGIC_WALL ?
 			    SND_MAGIC_WALL_ACTIVATING :
 			    SND_BD_MAGIC_WALL_ACTIVATING));
     }
@@ -3115,20 +3176,20 @@ void Impact(int x, int y)
 	else if (smashed == EL_NUT)
 	{
 	  Feld[x][y + 1] = EL_NUT_BREAKING;
-	  PlaySoundLevel(x, y, SND_NUT_BREAKING);
+	  PlayLevelSound(x, y, SND_NUT_BREAKING);
 	  RaiseScoreElement(EL_NUT);
 	  return;
 	}
 	else if (smashed == EL_PEARL)
 	{
 	  Feld[x][y + 1] = EL_PEARL_BREAKING;
-	  PlaySoundLevel(x, y, SND_PEARL_BREAKING);
+	  PlayLevelSound(x, y, SND_PEARL_BREAKING);
 	  return;
 	}
 	else if (smashed == EL_DIAMOND)
 	{
 	  Feld[x][y + 1] = EL_DIAMOND_BREAKING;
-	  PlaySoundLevel(x, y, SND_DIAMOND_BREAKING);
+	  PlayLevelSound(x, y, SND_DIAMOND_BREAKING);
 	  return;
 	}
 	else if (IS_BELT_SWITCH(smashed))
@@ -3168,19 +3229,19 @@ void Impact(int x, int y)
        Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE))
   {
     if (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE)
-      PlaySoundLevel(x, y, SND_MAGIC_WALL_FILLING);
+      PlayLevelSound(x, y, SND_MAGIC_WALL_FILLING);
     else if (Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)
-      PlaySoundLevel(x, y, SND_BD_MAGIC_WALL_FILLING);
+      PlayLevelSound(x, y, SND_BD_MAGIC_WALL_FILLING);
 
     return;
   }
 
   /* play sound of object that hits the ground */
   if (lastline || object_hit)
-    PlaySoundLevelElementAction(x, y, element, ACTION_IMPACT);
+    PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
 }
 
-void TurnRound(int x, int y)
+inline static void TurnRoundExt(int x, int y)
 {
   static struct
   {
@@ -3379,6 +3440,11 @@ void TurnRound(int x, int y)
     int rnd_value = 24;
     int rnd = RND(rnd_value);
 
+#if 0
+    if (FrameCounter < 1 && x == 0 && y == 29)
+      printf(":2: %d/%d: %d [%d]\n", x, y, MovDir[x][y], FrameCounter);
+#endif
+
     if (can_move_on && rnd > rnd_value / 8)
       MovDir[x][y] = old_move_dir;
     else if (can_turn_left && can_turn_right)
@@ -3393,8 +3459,25 @@ void TurnRound(int x, int y)
     xx = x + move_xy[MovDir[x][y]].x;
     yy = y + move_xy[MovDir[x][y]].y;
 
+#if 0
+    if (FrameCounter < 1 && x == 0 && y == 29)
+      printf(":3: %d/%d: %d (%d/%d: %d) [%d]\n", x, y, MovDir[x][y],
+	     xx, yy, Feld[xx][yy],
+	     FrameCounter);
+#endif
+
+#if 1
+    if (!IN_LEV_FIELD_AND_IS_FREE(xx, yy))
+      MovDir[x][y] = old_move_dir;
+#else
     if (!IS_FREE(xx, yy))
       MovDir[x][y] = old_move_dir;
+#endif
+
+#if 0
+    if (FrameCounter < 1 && x == 0 && y == 29)
+      printf(":4: %d/%d: %d [%d]\n", x, y, MovDir[x][y], FrameCounter);
+#endif
 
     MovDelay[x][y] = 0;
   }
@@ -3454,7 +3537,7 @@ void TurnRound(int x, int y)
     {
       int i;
 
-      for (i=0; i<MAX_PLAYERS; i++)
+      for (i = 0; i < MAX_PLAYERS; i++)
       {
 	struct PlayerInfo *player = &stored_player[i];
 	int jx = player->jx, jy = player->jy;
@@ -3488,7 +3571,7 @@ void TurnRound(int x, int y)
 	{ 0, +1 }
       };
 
-      for (i=0; i<4; i++)
+      for (i = 0; i < 4; i++)
       {
     	int ex = x + xy[i % 4][0];
     	int ey = y + xy[i % 4][1];
@@ -3660,7 +3743,7 @@ void TurnRound(int x, int y)
     {
       int i;
 
-      for (i=0; i<MAX_PLAYERS; i++)
+      for (i = 0; i < MAX_PLAYERS; i++)
       {
 	struct PlayerInfo *player = &stored_player[i];
 	int jx = player->jx, jy = player->jy;
@@ -3720,11 +3803,37 @@ void TurnRound(int x, int y)
   }
 }
 
+static void TurnRound(int x, int y)
+{
+  int direction = MovDir[x][y];
+
+#if 0
+  GfxDir[x][y] = MovDir[x][y];
+#endif
+
+  TurnRoundExt(x, y);
+
+#if 1
+  GfxDir[x][y] = MovDir[x][y];
+#endif
+
+  if (direction != MovDir[x][y])
+    GfxFrame[x][y] = 0;
+
+#if 1
+  if (MovDelay[x][y])
+    GfxAction[x][y] = ACTION_TURNING_FROM_LEFT + MV_DIR_BIT(direction);
+#else
+  if (MovDelay[x][y])
+    GfxAction[x][y] = ACTION_WAITING;
+#endif
+}
+
 static boolean JustBeingPushed(int x, int y)
 {
   int i;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
 
@@ -3750,9 +3859,14 @@ void StartMoving(int x, int y)
   if (Stop[x][y])
     return;
 
+#if 1
+  if (MovDelay[x][y] == 0)
+    GfxAction[x][y] = ACTION_DEFAULT;
+#else
   /* !!! this should be handled more generic (not only for mole) !!! */
   if (element != EL_MOLE && GfxAction[x][y] != ACTION_DIGGING)
     GfxAction[x][y] = ACTION_DEFAULT;
+#endif
 
   if (CAN_FALL(element) && y < lev_fieldy - 1)
   {
@@ -3771,9 +3885,9 @@ void StartMoving(int x, int y)
 	Feld[x][y] = EL_QUICKSAND_EMPTYING;
 	Store[x][y] = EL_ROCK;
 #if 1
-	PlaySoundLevelAction(x, y, ACTION_EMPTYING);
+	PlayLevelSoundAction(x, y, ACTION_EMPTYING);
 #else
-	PlaySoundLevel(x, y, SND_QUICKSAND_EMPTYING);
+	PlayLevelSound(x, y, SND_QUICKSAND_EMPTYING);
 #endif
       }
       else if (Feld[x][y + 1] == EL_QUICKSAND_EMPTY)
@@ -3793,9 +3907,9 @@ void StartMoving(int x, int y)
 	Store[x][y + 1] = Store[x][y];
 	Store[x][y] = 0;
 #if 1
-	PlaySoundLevelAction(x, y, ACTION_FILLING);
+	PlayLevelSoundAction(x, y, ACTION_FILLING);
 #else
-	PlaySoundLevel(x, y, SND_QUICKSAND_FILLING);
+	PlayLevelSound(x, y, SND_QUICKSAND_FILLING);
 #endif
       }
     }
@@ -3808,9 +3922,9 @@ void StartMoving(int x, int y)
       Feld[x][y] = EL_QUICKSAND_FILLING;
       Store[x][y] = element;
 #if 1
-      PlaySoundLevelAction(x, y, ACTION_FILLING);
+      PlayLevelSoundAction(x, y, ACTION_FILLING);
 #else
-      PlaySoundLevel(x, y, SND_QUICKSAND_FILLING);
+      PlayLevelSound(x, y, SND_QUICKSAND_FILLING);
 #endif
     }
     else if (element == EL_MAGIC_WALL_FULL)
@@ -4054,6 +4168,11 @@ void StartMoving(int x, int y)
 #endif
 #endif
 
+#if 0
+    if (FrameCounter < 1 && x == 0 && y == 29)
+      printf(":1: %d/%d: %d [%d]\n", x, y, MovDir[x][y], FrameCounter);
+#endif
+
     if (!MovDelay[x][y])	/* start new movement phase */
     {
       /* all objects that can change their move direction after each step
@@ -4068,6 +4187,11 @@ void StartMoving(int x, int y)
       {
 	TurnRound(x, y);
 
+#if 0
+	if (FrameCounter < 1 && x == 0 && y == 29)
+	  printf(":9: %d: %d [%d]\n", y, MovDir[x][y], FrameCounter);
+#endif
+
 	if (MovDelay[x][y] && (element == EL_BUG ||
 			       element == EL_SPACESHIP ||
 			       element == EL_SP_SNIKSNAK ||
@@ -4096,7 +4220,13 @@ void StartMoving(int x, int y)
 	/* !!! PLACE THIS SOMEWHERE AFTER "TurnRound()" !!! */
 	ResetGfxAnimation(x, y);
 #endif
+
+#if 0
+	if (GfxAction[x][y] != ACTION_WAITING)
+	  printf("::: %d: %d != ACTION_WAITING\n", element, GfxAction[x][y]);
+
 	GfxAction[x][y] = ACTION_WAITING;
+#endif
       }
 
       if (element == EL_ROBOT ||
@@ -4111,7 +4241,7 @@ void StartMoving(int x, int y)
 #else
 	DrawLevelElementAnimationIfNeeded(x, y, element);
 #endif
-	PlaySoundLevelAction(x, y, ACTION_WAITING);
+	PlayLevelSoundAction(x, y, ACTION_WAITING);
       }
       else if (element == EL_SP_ELECTRON)
 	DrawLevelElementAnimationIfNeeded(x, y, element);
@@ -4138,9 +4268,9 @@ void StartMoving(int x, int y)
 	else
 	  DrawLevelField(x, y);
 
-	PlaySoundLevelActionIfLoop(x, y, ACTION_ATTACKING);
+	PlayLevelSoundActionIfLoop(x, y, ACTION_ATTACKING);
 
-	for (i=1; i <= 3; i++)
+	for (i = 1; i <= 3; i++)
 	{
 	  int xx = x + i * dx;
 	  int yy = y + i * dy;
@@ -4178,15 +4308,17 @@ void StartMoving(int x, int y)
 
       if (MovDelay[x][y])	/* element still has to wait some time */
       {
-	PlaySoundLevelAction(x, y, ACTION_WAITING);
+	PlayLevelSoundAction(x, y, ACTION_WAITING);
 
 	return;
       }
 
+#if 0
       /* special case of "moving" animation of waiting elements (FIX THIS !!!);
 	 for all other elements GfxAction will be set by InitMovingField() */
       if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY)
 	GfxAction[x][y] = ACTION_MOVING;
+#endif
     }
 
     /* now make next step */
@@ -4226,7 +4358,7 @@ void StartMoving(int x, int y)
 	Feld[x][y] = EL_EMPTY;
 	DrawLevelField(x, y);
 
-	PlaySoundLevel(newx, newy, SND_PENGUIN_PASSING);
+	PlayLevelSound(newx, newy, SND_PENGUIN_PASSING);
 	if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
 	  DrawGraphicThruMask(SCREENX(newx),SCREENY(newy), el2img(element), 0);
 
@@ -4242,7 +4374,7 @@ void StartMoving(int x, int y)
 	if (DigField(local_player, newx, newy, 0, 0, DF_DIG) == MF_MOVING)
 	  DrawLevelField(newx, newy);
 	else
-	  MovDir[x][y] = MV_NO_MOVING;
+	  GfxDir[x][y] = MovDir[x][y] = MV_NO_MOVING;
       }
       else if (!IS_FREE(newx, newy))
       {
@@ -4267,7 +4399,7 @@ void StartMoving(int x, int y)
 	  DrawLevelField(newx, newy);
 	}
 
-	PlaySoundLevel(x, y, SND_PIG_DIGGING);
+	PlayLevelSound(x, y, SND_PIG_DIGGING);
       }
       else if (!IS_FREE(newx, newy))
       {
@@ -4316,7 +4448,7 @@ void StartMoving(int x, int y)
 	  else
 	    DrawLevelField(x, y);
 
-	  PlaySoundLevel(x, y, SND_DRAGON_ATTACKING);
+	  PlayLevelSound(x, y, SND_DRAGON_ATTACKING);
 
 	  MovDelay[x][y] = 50;
 
@@ -4341,7 +4473,7 @@ void StartMoving(int x, int y)
 	DrawLevelField(newx, newy);
       }
 
-      PlaySoundLevel(x, y, SND_YAMYAM_DIGGING);
+      PlayLevelSound(x, y, SND_YAMYAM_DIGGING);
     }
     else if (element == EL_DARK_YAMYAM && IN_LEV_FIELD(newx, newy) &&
 	     IS_FOOD_DARK_YAMYAM(Feld[newx][newy]))
@@ -4362,7 +4494,7 @@ void StartMoving(int x, int y)
 	DrawLevelField(newx, newy);
       }
 
-      PlaySoundLevel(x, y, SND_DARK_YAMYAM_DIGGING);
+      PlayLevelSound(x, y, SND_DARK_YAMYAM_DIGGING);
     }
     else if ((element == EL_PACMAN || element == EL_MOLE)
 	     && IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Feld[newx][newy]))
@@ -4378,7 +4510,7 @@ void StartMoving(int x, int y)
       if (element == EL_MOLE)
       {
 	Feld[newx][newy] = EL_AMOEBA_SHRINKING;
-	PlaySoundLevel(x, y, SND_MOLE_DIGGING);
+	PlayLevelSound(x, y, SND_MOLE_DIGGING);
 
 	ResetGfxAnimation(x, y);
 	GfxAction[x][y] = ACTION_DIGGING;
@@ -4391,7 +4523,7 @@ void StartMoving(int x, int y)
       {
 	Feld[newx][newy] = EL_EMPTY;
 	DrawLevelField(newx, newy);
-	PlaySoundLevel(x, y, SND_PACMAN_DIGGING);
+	PlayLevelSound(x, y, SND_PACMAN_DIGGING);
       }
     }
     else if (element == EL_MOLE && IN_LEV_FIELD(newx, newy) &&
@@ -4430,7 +4562,7 @@ void StartMoving(int x, int y)
 	TestIfBadThingTouchesHero(x, y);
 
 #if 0
-      PlaySoundLevelAction(x, y, ACTION_WAITING);
+      PlayLevelSoundAction(x, y, ACTION_WAITING);
 #endif
 
       return;
@@ -4438,7 +4570,7 @@ void StartMoving(int x, int y)
 
     InitMovingField(x, y, MovDir[x][y]);
 
-    PlaySoundLevelAction(x, y, ACTION_MOVING);
+    PlayLevelSoundAction(x, y, ACTION_MOVING);
   }
 
   if (MovDir[x][y])
@@ -4554,8 +4686,9 @@ void ContinueMoving(int x, int y)
 
   /* copy animation control values to new field */
   GfxFrame[newx][newy]  = GfxFrame[x][y];
-  GfxAction[newx][newy] = GfxAction[x][y];	/* keep action one frame */
   GfxRandom[newx][newy] = GfxRandom[x][y];	/* keep same random value */
+  GfxAction[newx][newy] = GfxAction[x][y];	/* keep action one frame  */
+  GfxDir[newx][newy]    = GfxDir[x][y];		/* keep element direction */
 
   Pushed[x][y] = Pushed[newx][newy] = FALSE;
 
@@ -4580,7 +4713,7 @@ void ContinueMoving(int x, int y)
 
   if (!CAN_MOVE(element) ||
       (CAN_FALL(element) && direction == MV_DOWN))
-    MovDir[newx][newy] = 0;
+    GfxDir[x][y] = MovDir[newx][newy] = 0;
 
 #endif
 #endif
@@ -4608,7 +4741,9 @@ void ContinueMoving(int x, int y)
   {
     TestIfBadThingTouchesHero(newx, newy);
     TestIfBadThingTouchesFriend(newx, newy);
-    TestIfBadThingTouchesOtherBadThing(newx, newy);
+
+    if (!IS_CUSTOM_ELEMENT(element))
+      TestIfBadThingTouchesOtherBadThing(newx, newy);
   }
   else if (element == EL_PENGUIN)
     TestIfFriendTouchesBadThing(newx, newy);
@@ -4647,7 +4782,7 @@ int AmoebeNachbarNr(int ax, int ay)
     { 0, +1 }
   };
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int x = ax + xy[i][0];
     int y = ay + xy[i][1];
@@ -4677,7 +4812,7 @@ void AmoebenVereinigen(int ax, int ay)
   if (new_group_nr == 0)
     return;
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     x = ax + xy[i][0];
     y = ay + xy[i][1];
@@ -4700,9 +4835,9 @@ void AmoebenVereinigen(int ax, int ay)
       AmoebaCnt2[new_group_nr] += AmoebaCnt2[old_group_nr];
       AmoebaCnt2[old_group_nr] = 0;
 
-      for (yy=0; yy<lev_fieldy; yy++)
+      for (yy = 0; yy < lev_fieldy; yy++)
       {
-	for (xx=0; xx<lev_fieldx; xx++)
+	for (xx = 0; xx < lev_fieldx; xx++)
 	{
 	  if (AmoebaNr[xx][yy] == old_group_nr)
 	    AmoebaNr[xx][yy] = new_group_nr;
@@ -4729,9 +4864,9 @@ void AmoebeUmwandeln(int ax, int ay)
     }
 #endif
 
-    for (y=0; y<lev_fieldy; y++)
+    for (y = 0; y < lev_fieldy; y++)
     {
-      for (x=0; x<lev_fieldx; x++)
+      for (x = 0; x < lev_fieldx; x++)
       {
 	if (Feld[x][y] == EL_AMOEBA_DEAD && AmoebaNr[x][y] == group_nr)
 	{
@@ -4740,7 +4875,7 @@ void AmoebeUmwandeln(int ax, int ay)
 	}
       }
     }
-    PlaySoundLevel(ax, ay, (IS_GEM(level.amoeba_content) ?
+    PlayLevelSound(ax, ay, (IS_GEM(level.amoeba_content) ?
 			    SND_AMOEBA_TURNING_TO_GEM :
 			    SND_AMOEBA_TURNING_TO_ROCK));
     Bang(ax, ay);
@@ -4755,7 +4890,7 @@ void AmoebeUmwandeln(int ax, int ay)
       { 0, +1 }
     };
 
-    for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++)
     {
       x = ax + xy[i][0];
       y = ay + xy[i][1];
@@ -4765,7 +4900,7 @@ void AmoebeUmwandeln(int ax, int ay)
 
       if (Feld[x][y] == EL_AMOEBA_TO_DIAMOND)
       {
-	PlaySoundLevel(x, y, (IS_GEM(level.amoeba_content) ?
+	PlayLevelSound(x, y, (IS_GEM(level.amoeba_content) ?
 			      SND_AMOEBA_TURNING_TO_GEM :
 			      SND_AMOEBA_TURNING_TO_ROCK));
 	Bang(x, y);
@@ -4789,9 +4924,9 @@ void AmoebeUmwandelnBD(int ax, int ay, int new_element)
   }
 #endif
 
-  for (y=0; y<lev_fieldy; y++)
+  for (y = 0; y < lev_fieldy; y++)
   {
-    for (x=0; x<lev_fieldx; x++)
+    for (x = 0; x < lev_fieldx; x++)
     {
       if (AmoebaNr[x][y] == group_nr &&
 	  (Feld[x][y] == EL_AMOEBA_DEAD ||
@@ -4808,7 +4943,7 @@ void AmoebeUmwandelnBD(int ax, int ay, int new_element)
   }
 
   if (done)
-    PlaySoundLevel(ax, ay, (new_element == EL_BD_ROCK ?
+    PlayLevelSound(ax, ay, (new_element == EL_BD_ROCK ?
 			    SND_BD_AMOEBA_TURNING_TO_ROCK :
 			    SND_BD_AMOEBA_TURNING_TO_GEM));
 }
@@ -4825,12 +4960,12 @@ void AmoebeWaechst(int x, int y)
     if (DelayReached(&sound_delay, sound_delay_value))
     {
 #if 1
-      PlaySoundLevelElementAction(x, y, Store[x][y], ACTION_GROWING);
+      PlayLevelSoundElementAction(x, y, Store[x][y], ACTION_GROWING);
 #else
       if (Store[x][y] == EL_BD_AMOEBA)
-	PlaySoundLevel(x, y, SND_BD_AMOEBA_GROWING);
+	PlayLevelSound(x, y, SND_BD_AMOEBA_GROWING);
       else
-	PlaySoundLevel(x, y, SND_AMOEBA_GROWING);
+	PlayLevelSound(x, y, SND_AMOEBA_GROWING);
 #endif
       sound_delay_value = 30;
     }
@@ -4951,7 +5086,7 @@ void AmoebeAbleger(int ax, int ay)
     int start = RND(4);
     boolean waiting_for_player = FALSE;
 
-    for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++)
     {
       int j = (start + i) % 4;
       int x = ax + xy[j][0];
@@ -5030,9 +5165,9 @@ void AmoebeAbleger(int ax, int ay)
   {
     Feld[newax][neway] = EL_AMOEBA_DROP;	/* drop left/right of amoeba */
 #if 1
-    PlaySoundLevelAction(newax, neway, ACTION_GROWING);
+    PlayLevelSoundAction(newax, neway, ACTION_GROWING);
 #else
-    PlaySoundLevel(newax, neway, SND_AMOEBA_GROWING);
+    PlayLevelSound(newax, neway, SND_AMOEBA_GROWING);
 #endif
   }
   else
@@ -5072,7 +5207,7 @@ void Life(int ax, int ay)
       return;
   }
 
-  for (y1=-1; y1<2; y1++) for(x1=-1; x1<2; x1++)
+  for (y1 = -1; y1 < 2; y1++) for (x1 = -1; x1 < 2; x1++)
   {
     int xx = ax+x1, yy = ay+y1;
     int nachbarn = 0;
@@ -5080,7 +5215,7 @@ void Life(int ax, int ay)
     if (!IN_LEV_FIELD(xx, yy))
       continue;
 
-    for (y2=-1; y2<2; y2++) for (x2=-1; x2<2; x2++)
+    for (y2 = -1; y2 < 2; y2++) for (x2 = -1; x2 < 2; x2++)
     {
       int x = xx+x2, y = yy+y2;
 
@@ -5121,7 +5256,7 @@ void Life(int ax, int ay)
   }
 
   if (changed)
-    PlaySoundLevel(ax, ay, element == EL_BIOMAZE ? SND_BIOMAZE_GROWING :
+    PlayLevelSound(ax, ay, element == EL_BIOMAZE ? SND_BIOMAZE_GROWING :
 		   SND_GAME_OF_LIFE_GROWING);
 }
 
@@ -5132,7 +5267,7 @@ static void InitRobotWheel(int x, int y)
 
 static void RunRobotWheel(int x, int y)
 {
-  PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE);
+  PlayLevelSound(x, y, SND_ROBOT_WHEEL_ACTIVE);
 }
 
 static void StopRobotWheel(int x, int y)
@@ -5148,7 +5283,7 @@ static void InitTimegateWheel(int x, int y)
 
 static void RunTimegateWheel(int x, int y)
 {
-  PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE);
+  PlayLevelSound(x, y, SND_TIMEGATE_SWITCH_ACTIVE);
 }
 
 void CheckExit(int x, int y)
@@ -5171,7 +5306,7 @@ void CheckExit(int x, int y)
 
   Feld[x][y] = EL_EXIT_OPENING;
 
-  PlaySoundLevelNearest(x, y, SND_CLASS_EXIT_OPENING);
+  PlayLevelSoundNearest(x, y, SND_CLASS_EXIT_OPENING);
 }
 
 void CheckExitSP(int x, int y)
@@ -5192,16 +5327,16 @@ void CheckExitSP(int x, int y)
 
   Feld[x][y] = EL_SP_EXIT_OPENING;
 
-  PlaySoundLevelNearest(x, y, SND_CLASS_SP_EXIT_OPENING);
+  PlayLevelSoundNearest(x, y, SND_CLASS_SP_EXIT_OPENING);
 }
 
 static void CloseAllOpenTimegates()
 {
   int x, y;
 
-  for (y=0; y<lev_fieldy; y++)
+  for (y = 0; y < lev_fieldy; y++)
   {
-    for (x=0; x<lev_fieldx; x++)
+    for (x = 0; x < lev_fieldx; x++)
     {
       int element = Feld[x][y];
 
@@ -5209,9 +5344,9 @@ static void CloseAllOpenTimegates()
       {
 	Feld[x][y] = EL_TIMEGATE_CLOSING;
 #if 1
-	PlaySoundLevelAction(x, y, ACTION_CLOSING);
+	PlayLevelSoundAction(x, y, ACTION_CLOSING);
 #else
-	PlaySoundLevel(x, y, SND_TIMEGATE_CLOSING);
+	PlayLevelSound(x, y, SND_TIMEGATE_CLOSING);
 #endif
       }
     }
@@ -5273,7 +5408,7 @@ void MauerWaechst(int x, int y)
 
     if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
     {
-      int graphic = el_dir2img(Feld[x][y], MovDir[x][y]);
+      int graphic = el_dir2img(Feld[x][y], GfxDir[x][y]);
       int frame = getGraphicAnimationFrame(graphic, 17 - MovDelay[x][y]);
 
       DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
@@ -5304,7 +5439,7 @@ void MauerWaechst(int x, int y)
 
       Feld[x][y] = Store[x][y];
       Store[x][y] = 0;
-      MovDir[x][y] = MV_NO_MOVING;
+      GfxDir[x][y] = MovDir[x][y] = MV_NO_MOVING;
       DrawLevelField(x, y);
     }
   }
@@ -5349,7 +5484,7 @@ void MauerAbleger(int ax, int ay)
     {
       Feld[ax][ay-1] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax][ay-1] = element;
-      MovDir[ax][ay-1] = MV_UP;
+      GfxDir[ax][ay-1] = MovDir[ax][ay-1] = MV_UP;
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1)))
   	DrawGraphic(SCREENX(ax), SCREENY(ay - 1),
 		    IMG_EXPANDABLE_WALL_GROWING_UP, 0);
@@ -5359,7 +5494,7 @@ void MauerAbleger(int ax, int ay)
     {
       Feld[ax][ay+1] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax][ay+1] = element;
-      MovDir[ax][ay+1] = MV_DOWN;
+      GfxDir[ax][ay+1] = MovDir[ax][ay+1] = MV_DOWN;
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1)))
   	DrawGraphic(SCREENX(ax), SCREENY(ay + 1),
 		    IMG_EXPANDABLE_WALL_GROWING_DOWN, 0);
@@ -5375,7 +5510,7 @@ void MauerAbleger(int ax, int ay)
     {
       Feld[ax-1][ay] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax-1][ay] = element;
-      MovDir[ax-1][ay] = MV_LEFT;
+      GfxDir[ax-1][ay] = MovDir[ax-1][ay] = MV_LEFT;
       if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay)))
   	DrawGraphic(SCREENX(ax - 1), SCREENY(ay),
 		    IMG_EXPANDABLE_WALL_GROWING_LEFT, 0);
@@ -5386,7 +5521,7 @@ void MauerAbleger(int ax, int ay)
     {
       Feld[ax+1][ay] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax+1][ay] = element;
-      MovDir[ax+1][ay] = MV_RIGHT;
+      GfxDir[ax+1][ay] = MovDir[ax+1][ay] = MV_RIGHT;
       if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay)))
   	DrawGraphic(SCREENX(ax + 1), SCREENY(ay),
 		    IMG_EXPANDABLE_WALL_GROWING_RIGHT, 0);
@@ -5415,9 +5550,9 @@ void MauerAbleger(int ax, int ay)
 
   if (new_wall)
 #if 1
-    PlaySoundLevelAction(ax, ay, ACTION_GROWING);
+    PlayLevelSoundAction(ax, ay, ACTION_GROWING);
 #else
-    PlaySoundLevel(ax, ay, SND_EXPANDABLE_WALL_GROWING);
+    PlayLevelSound(ax, ay, SND_EXPANDABLE_WALL_GROWING);
 #endif
 }
 
@@ -5433,9 +5568,9 @@ void CheckForDragon(int x, int y)
     { 0, +1 }
   };
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
-    for (j=0; j<4; j++)
+    for (j = 0; j < 4; j++)
     {
       int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
 
@@ -5452,9 +5587,9 @@ void CheckForDragon(int x, int y)
 
   if (!dragon_found)
   {
-    for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++)
     {
-      for (j=0; j<3; j++)
+      for (j = 0; j < 3; j++)
       {
   	int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
   
@@ -5495,13 +5630,13 @@ static void WarnBuggyBase(int x, int y)
     { 0, +1 }
   };
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int xx = x + xy[i][0], yy = y + xy[i][1];
 
     if (IS_PLAYER(xx, yy))
     {
-      PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE);
+      PlayLevelSound(x, y, SND_SP_BUGGY_BASE_ACTIVE);
 
       break;
     }
@@ -5515,7 +5650,7 @@ static void InitTrap(int x, int y)
 
 static void ActivateTrap(int x, int y)
 {
-  PlaySoundLevel(x, y, SND_TRAP_ACTIVATING);
+  PlayLevelSound(x, y, SND_TRAP_ACTIVATING);
 }
 
 static void ChangeActiveTrap(int x, int y)
@@ -5597,7 +5732,7 @@ static boolean ChangeElementNow(int x, int y, int element, int page)
     boolean can_change[3][3];
     int xx, yy;
 
-    for (yy = 0; yy < 3; yy++) for(xx = 0; xx < 3 ; xx++)
+    for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3 ; xx++)
     {
       boolean half_destructible;
       int ex = x + xx - 1;
@@ -5648,7 +5783,7 @@ static boolean ChangeElementNow(int x, int y, int element, int page)
 	  RND(100) < change->random)
 	return FALSE;
 
-      for (yy = 0; yy < 3; yy++) for(xx = 0; xx < 3 ; xx++)
+      for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3 ; xx++)
       {
 	int ex = x + xx - 1;
 	int ey = y + yy - 1;
@@ -5672,14 +5807,14 @@ static boolean ChangeElementNow(int x, int y, int element, int page)
       }
 
       if (something_has_changed)
-	PlaySoundLevelElementAction(x, y, element, ACTION_CHANGING);
+	PlayLevelSoundElementAction(x, y, element, ACTION_CHANGING);
     }
   }
   else
   {
     ChangeElementNowExt(x, y, change->target_element);
 
-    PlaySoundLevelElementAction(x, y, element, ACTION_CHANGING);
+    PlayLevelSoundElementAction(x, y, element, ACTION_CHANGING);
   }
 
   return TRUE;
@@ -5720,7 +5855,7 @@ static void ChangeElement(int x, int y, int page)
 
   if (ChangeDelay[x][y] != 0)		/* continue element change */
   {
-    int graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+    int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
 
     if (IS_ANIMATED(graphic))
       DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
@@ -5762,7 +5897,7 @@ static boolean CheckTriggeredElementSideChange(int lx, int ly,
   if (!(trigger_events[trigger_element] & CH_EVENT_BIT(trigger_event)))
     return FALSE;
 
-  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
     int element = EL_CUSTOM_START + i;
 
@@ -5772,7 +5907,7 @@ static boolean CheckTriggeredElementSideChange(int lx, int ly,
     if (!CAN_CHANGE(element) || !HAS_ANY_CHANGE_EVENT(element, trigger_event))
       continue;
 
-    for (j=0; j < element_info[element].num_change_pages; j++)
+    for (j = 0; j < element_info[element].num_change_pages; j++)
     {
       struct ElementChangeInfo *change = &element_info[element].change_page[j];
 
@@ -5799,7 +5934,7 @@ static boolean CheckTriggeredElementSideChange(int lx, int ly,
     if (!change_element)
       continue;
 
-    for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+    for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
     {
 #if 0
       if (x == lx && y == ly)	/* do not change trigger element itself */
@@ -5855,6 +5990,167 @@ static boolean CheckElementChange(int x, int y, int element, int trigger_event)
   return CheckElementSideChange(x, y, element, CH_SIDE_ANY, trigger_event, -1);
 }
 
+static void SetPlayerWaiting(struct PlayerInfo *player, boolean is_waiting)
+{
+  int jx = player->jx, jy = player->jy;
+  int element = player->element_nr;
+  boolean was_waiting = player->is_waiting;
+
+  if (is_waiting)
+  {
+    int action;
+
+    if (!was_waiting)		/* not waiting -> waiting */
+    {
+      player->is_waiting = TRUE;
+
+      player->frame_counter_bored =
+	FrameCounter +
+	game.player_boring_delay_fixed +
+	SimpleRND(game.player_boring_delay_random);
+      player->frame_counter_sleeping =
+	FrameCounter +
+	game.player_sleeping_delay_fixed +
+	SimpleRND(game.player_sleeping_delay_random);
+
+      InitPlayerGfxAnimation(player, ACTION_WAITING, player->MovDir);
+    }
+
+    if (game.player_sleeping_delay_fixed != -1 &&
+	game.player_sleeping_delay_random != -1 &&
+	player->anim_delay_counter == 0 &&
+	player->post_delay_counter == 0 &&
+	FrameCounter >= player->frame_counter_sleeping)
+      player->is_sleeping = TRUE;
+    else if (game.player_boring_delay_fixed != -1 &&
+	     game.player_boring_delay_random != -1 &&
+	     FrameCounter >= player->frame_counter_bored)
+      player->is_bored = TRUE;
+
+    action = (player->is_sleeping ? ACTION_SLEEPING :
+	      player->is_bored ? ACTION_BORING : ACTION_WAITING);
+
+    if (!was_waiting)
+      PlayLevelSoundElementAction(jx, jy, element, action);
+    else
+      PlayLevelSoundElementActionIfLoop(jx, jy, element, action);
+  }
+  else if (was_waiting)		/* waiting -> not waiting */
+  {
+    if (player->is_sleeping)
+      PlayLevelSoundElementAction(jx, jy, element, ACTION_AWAKENING);
+
+    player->is_waiting = FALSE;
+    player->is_bored = FALSE;
+    player->is_sleeping = FALSE;
+
+    player->frame_counter_bored = -1;
+    player->frame_counter_sleeping = -1;
+
+    player->anim_delay_counter = 0;
+    player->post_delay_counter = 0;
+
+    player->special_action_bored = ACTION_DEFAULT;
+    player->special_action_sleeping = ACTION_DEFAULT;
+  }
+}
+
+#if 1
+static byte PlayerActions(struct PlayerInfo *player, byte player_action)
+{
+#if 0
+  static byte stored_player_action[MAX_PLAYERS];
+  static int num_stored_actions = 0;
+#endif
+  boolean moved = FALSE, snapped = FALSE, dropped = 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 0
+  stored_player_action[player->index_nr] = 0;
+  num_stored_actions++;
+#endif
+
+#if 0
+  printf("::: player %d [%d]\n", player->index_nr, FrameCounter);
+#endif
+
+  if (!player->active || tape.pausing)
+    return 0;
+
+  if (player_action)
+  {
+#if 0
+    printf("::: player %d acts [%d]\n", player->index_nr, FrameCounter);
+#endif
+
+    if (button1)
+      snapped = SnapField(player, dx, dy);
+    else
+    {
+      if (button2)
+	dropped = DropElement(player);
+
+      moved = MovePlayer(player, dx, dy);
+    }
+
+    if (tape.single_step && tape.recording && !tape.pausing)
+    {
+      if (button1 || (dropped && !moved))
+      {
+	TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+	SnapField(player, 0, 0);		/* stop snapping */
+      }
+    }
+
+    SetPlayerWaiting(player, FALSE);
+
+#if 1
+    return player_action;
+#else
+    stored_player_action[player->index_nr] = player_action;
+#endif
+  }
+  else
+  {
+#if 0
+    printf("::: player %d waits [%d]\n", player->index_nr, FrameCounter);
+#endif
+
+    /* no actions for this player (no input at player's configured device) */
+
+    DigField(player, 0, 0, 0, 0, DF_NO_PUSH);
+    SnapField(player, 0, 0);
+    CheckGravityMovement(player);
+
+    if (player->MovPos == 0)
+      SetPlayerWaiting(player, TRUE);
+
+    if (player->MovPos == 0)	/* needed for tape.playing */
+      player->is_moving = FALSE;
+
+    return 0;
+  }
+
+#if 0
+  if (tape.recording && num_stored_actions >= MAX_PLAYERS)
+  {
+    printf("::: player %d recorded [%d]\n", player->index_nr, FrameCounter);
+
+    TapeRecordAction(stored_player_action);
+    num_stored_actions = 0;
+  }
+#endif
+}
+
+#else
+
 static void PlayerActions(struct PlayerInfo *player, byte player_action)
 {
   static byte stored_player_action[MAX_PLAYERS];
@@ -5872,11 +6168,15 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
   stored_player_action[player->index_nr] = 0;
   num_stored_actions++;
 
+  printf("::: player %d [%d]\n", player->index_nr, FrameCounter);
+
   if (!player->active || tape.pausing)
     return;
 
   if (player_action)
   {
+    printf("::: player %d acts [%d]\n", player->index_nr, FrameCounter);
+
     if (button1)
       snapped = SnapField(player, dx, dy);
     else
@@ -5900,6 +6200,8 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
   }
   else
   {
+    printf("::: player %d waits [%d]\n", player->index_nr, FrameCounter);
+
     /* no actions for this player (no input at player's configured device) */
 
     DigField(player, 0, 0, 0, 0, DF_NO_PUSH);
@@ -5915,10 +6217,13 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
 
   if (tape.recording && num_stored_actions >= MAX_PLAYERS)
   {
+    printf("::: player %d recorded [%d]\n", player->index_nr, FrameCounter);
+
     TapeRecordAction(stored_player_action);
     num_stored_actions = 0;
   }
 }
+#endif
 
 void GameActions()
 {
@@ -5928,6 +6233,9 @@ void GameActions()
   int i, x, y, element, graphic;
   byte *recorded_player_action;
   byte summarized_player_action = 0;
+#if 1
+  byte tape_action[MAX_PLAYERS];
+#endif
 
   if (game_status != GAME_MODE_PLAYING)
     return;
@@ -5972,9 +6280,13 @@ void GameActions()
   if (tape.pausing)
     return;
 
+#if 0
+  printf("::: getting new tape action [%d]\n", FrameCounter);
+#endif
+
   recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     summarized_player_action |= stored_player[i].action;
 
@@ -5990,7 +6302,7 @@ void GameActions()
   if (!options.network && !setup.team_mode)
     local_player->effective_action = summarized_player_action;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     int actual_player_action = stored_player[i].effective_action;
 
@@ -6000,10 +6312,19 @@ void GameActions()
     if (recorded_player_action)
       actual_player_action = recorded_player_action[i];
 
-    PlayerActions(&stored_player[i], actual_player_action);
+    tape_action[i] = PlayerActions(&stored_player[i], actual_player_action);
+
+    if (tape.recording && tape_action[i] && !tape.player_participates[i])
+      tape.player_participates[i] = TRUE;    /* player just appeared from CE */
+
     ScrollPlayer(&stored_player[i], SCROLL_GO_ON);
   }
 
+#if 1
+  if (tape.recording)
+    TapeRecordAction(tape_action);
+#endif
+
   network_player_action_received = FALSE;
 
   ScrollScreen(NULL, SCROLL_GO_ON);
@@ -6012,14 +6333,14 @@ void GameActions()
   FrameCounter++;
   TimeFrames++;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
     stored_player[i].Frame++;
 #endif
 
 #if 1
   if (game.engine_version < VERSION_IDENT(2,2,0,7))
   {
-    for (i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
       struct PlayerInfo *player = &stored_player[i];
       int x = player->jx;
@@ -6040,7 +6361,7 @@ void GameActions()
   }
 #endif
 
-  for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+  for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
   {
     Changed[x][y] = CE_BITMASK_DEFAULT;
     ChangeEvent[x][y] = CE_BITMASK_DEFAULT;
@@ -6090,11 +6411,11 @@ void GameActions()
 #endif
   }
 
-  for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+  for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
   {
     element = Feld[x][y];
 #if 1
-    graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+    graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
 #else
     graphic = el2img(element);
 #endif
@@ -6118,7 +6439,7 @@ void GameActions()
     SetRandomAnimationValue(x, y);
 
 #if 1
-    PlaySoundLevelActionIfLoop(x, y, GfxAction[x][y]);
+    PlayLevelSoundActionIfLoop(x, y, GfxAction[x][y]);
 #endif
 
     if (IS_INACTIVE(element))
@@ -6131,7 +6452,12 @@ void GameActions()
 
 #if 1
     /* this may take place after moving, so 'element' may have changed */
+#if 0
     if (IS_CHANGING(x, y))
+#else
+    if (IS_CHANGING(x, y) &&
+	(game.engine_version < VERSION_IDENT(3,0,7,1) || !Stop[x][y]))
+#endif
     {
 #if 0
       ChangeElement(x, y, ChangePage[x][y] != -1 ? ChangePage[x][y] :
@@ -6141,7 +6467,7 @@ void GameActions()
 #endif
 
       element = Feld[x][y];
-      graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+      graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
     }
 #endif
 
@@ -6150,7 +6476,7 @@ void GameActions()
       StartMoving(x, y);
 
 #if 1
-      graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+      graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
 #if 0
       if (element == EL_MOLE)
 	printf("::: %d, %d, %d [%d]\n",
@@ -6170,6 +6496,11 @@ void GameActions()
       {
 	DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
 
+#if 0
+	if (element == EL_BUG)
+	  printf("::: %d, %d\n", graphic, GfxFrame[x][y]);
+#endif
+
 #if 0
 	if (element == EL_MOLE)
 	  printf("::: %d, %d\n", graphic, GfxFrame[x][y]);
@@ -6238,7 +6569,7 @@ void GameActions()
 #endif
 
     if (IS_BELT_ACTIVE(element))
-      PlaySoundLevelAction(x, y, ACTION_ACTIVE);
+      PlayLevelSoundAction(x, y, ACTION_ACTIVE);
 
     if (game.magic_wall_active)
     {
@@ -6304,7 +6635,7 @@ void GameActions()
   {
     game.explosions_delayed = FALSE;
 
-    for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+    for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
     {
       element = Feld[x][y];
 
@@ -6328,9 +6659,9 @@ void GameActions()
       if (element == EL_BD_MAGIC_WALL_FULL ||
 	  element == EL_BD_MAGIC_WALL_ACTIVE ||
 	  element == EL_BD_MAGIC_WALL_EMPTYING)
-	PlaySoundLevel(magic_wall_x, magic_wall_y, SND_BD_MAGIC_WALL_ACTIVE);
+	PlayLevelSound(magic_wall_x, magic_wall_y, SND_BD_MAGIC_WALL_ACTIVE);
       else
-	PlaySoundLevel(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE);
+	PlayLevelSound(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE);
     }
 
     if (game.magic_wall_time_left > 0)
@@ -6338,7 +6669,7 @@ void GameActions()
       game.magic_wall_time_left--;
       if (!game.magic_wall_time_left)
       {
-	for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+	for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++)
 	{
 	  element = Feld[x][y];
 
@@ -6377,16 +6708,16 @@ void GameActions()
       CloseAllOpenTimegates();
   }
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
 
     if (SHIELD_ON(player))
     {
       if (player->shield_deadly_time_left)
-	PlaySoundLevel(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE);
+	PlayLevelSound(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE);
       else if (player->shield_normal_time_left)
-	PlaySoundLevel(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE);
+	PlayLevelSound(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE);
     }
   }
 
@@ -6395,7 +6726,7 @@ void GameActions()
     TimeFrames = 0;
     TimePlayed++;
 
-    for (i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
       struct PlayerInfo *player = &stored_player[i];
 
@@ -6421,7 +6752,7 @@ void GameActions()
       DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2);
 
       if (!TimeLeft && setup.time_limit)
-	for (i=0; i<MAX_PLAYERS; i++)
+	for (i = 0; i < MAX_PLAYERS; i++)
 	  KillHero(&stored_player[i]);
     }
     else if (level.time == 0 && !AllPlayersGone) /* level without time limit */
@@ -6464,7 +6795,7 @@ void GameActions()
   FrameCounter++;
   TimeFrames++;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     int move_frames =
       MOVE_DELAY_NORMAL_SPEED /  stored_player[i].move_delay_value;
@@ -6491,7 +6822,7 @@ static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y)
   int min_x = x, min_y = y, max_x = x, max_y = y;
   int i;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     int jx = stored_player[i].jx, jy = stored_player[i].jy;
 
@@ -6511,7 +6842,7 @@ static boolean AllPlayersInVisibleScreen()
 {
   int i;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
     int jx = stored_player[i].jx, jy = stored_player[i].jy;
 
@@ -6541,14 +6872,14 @@ void ScrollLevel(int dx, int dy)
   if (dx)
   {
     x = (dx == 1 ? BX1 : BX2);
-    for (y=BY1; y <= BY2; y++)
+    for (y = BY1; y <= BY2; y++)
       DrawScreenField(x, y);
   }
 
   if (dy)
   {
     y = (dy == 1 ? BY1 : BY2);
-    for (x=BX1; x <= BX2; x++)
+    for (x = BX1; x <= BX2; x++)
       DrawScreenField(x, y);
   }
 
@@ -7053,7 +7384,7 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
   int center_element = Feld[x][y];	/* should always be non-moving! */
   int i;
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int xx = x + xy[i][0];
     int yy = y + xy[i][1];
@@ -7129,7 +7460,7 @@ void TestIfElementTouchesCustomElement(int x, int y)
   int center_element = Feld[x][y];	/* should always be non-moving! */
   int i, j;
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int xx = x + xy[i][0];
     int yy = y + xy[i][1];
@@ -7154,7 +7485,7 @@ void TestIfElementTouchesCustomElement(int x, int y)
 	HAS_ANY_CHANGE_EVENT(center_element, CE_OTHER_IS_TOUCHING) &&
 	!change_center_element)
     {
-      for (j=0; j < element_info[center_element].num_change_pages; j++)
+      for (j = 0; j < element_info[center_element].num_change_pages; j++)
       {
 	struct ElementChangeInfo *change =
 	  &element_info[center_element].change_page[j];
@@ -7176,7 +7507,7 @@ void TestIfElementTouchesCustomElement(int x, int y)
     if (IS_CUSTOM_ELEMENT(border_element) &&
 	HAS_ANY_CHANGE_EVENT(border_element, CE_OTHER_IS_TOUCHING))
     {
-      for (j=0; j < element_info[border_element].num_change_pages; j++)
+      for (j = 0; j < element_info[border_element].num_change_pages; j++)
       {
 	struct ElementChangeInfo *change =
 	  &element_info[border_element].change_page[j];
@@ -7217,7 +7548,7 @@ void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir)
     MV_DOWN
   };
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int test_x, test_y, test_move_dir, test_element;
 
@@ -7292,7 +7623,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
   if (bad_element == EL_EXPLOSION)	/* skip just exploding bad things */
     return;
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int test_x, test_y, test_move_dir, test_element;
 
@@ -7396,7 +7727,7 @@ void TestIfBadThingTouchesOtherBadThing(int bad_x, int bad_y)
     { 0, +1 }
   };
 
-  for (i=0; i<4; i++)
+  for (i = 0; i < 4; i++)
   {
     int x, y, element;
 
@@ -7451,11 +7782,11 @@ void BuryHero(struct PlayerInfo *player)
     return;
 
 #if 1
-  PlaySoundLevelElementAction(jx, jy, player->element_nr, ACTION_DYING);
+  PlayLevelSoundElementAction(jx, jy, player->element_nr, ACTION_DYING);
 #else
-  PlaySoundLevel(jx, jy, SND_CLASS_PLAYER_DYING);
+  PlayLevelSound(jx, jy, SND_CLASS_PLAYER_DYING);
 #endif
-  PlaySoundLevel(jx, jy, SND_GAME_LOSING);
+  PlayLevelSound(jx, jy, SND_GAME_LOSING);
 
   player->GameOver = TRUE;
   RemoveHero(player);
@@ -7472,7 +7803,7 @@ void RemoveHero(struct PlayerInfo *player)
   if (!ExplodeField[jx][jy])
     StorePlayer[jx][jy] = 0;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
     if (stored_player[i].active)
       found = TRUE;
 
@@ -7650,7 +7981,7 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-      PlaySoundLevel(x, y, SND_CLASS_SP_PORT_PASSING);
+      PlayLevelSound(x, y, SND_CLASS_SP_PORT_PASSING);
       break;
 
     case EL_TUBE_ANY:
@@ -7692,7 +8023,7 @@ int DigField(struct PlayerInfo *player,
 	if (!(tube_enter_directions[i][1] & move_direction))
 	  return MF_NO_ACTION;	/* tube has no opening in this direction */
 
-	PlaySoundLevel(x, y, SND_CLASS_TUBE_WALKING);
+	PlayLevelSound(x, y, SND_CLASS_TUBE_WALKING);
       }
       break;
 
@@ -7725,9 +8056,9 @@ int DigField(struct PlayerInfo *player,
 
 	/* play sound from background or player, whatever is available */
 	if (element_info[element].sound[sound_action] != SND_UNDEFINED)
-	  PlaySoundLevelElementAction(x, y, element, sound_action);
+	  PlayLevelSoundElementAction(x, y, element, sound_action);
 	else
-	  PlaySoundLevelElementAction(x, y, player->element_nr, sound_action);
+	  PlayLevelSoundElementAction(x, y, player->element_nr, sound_action);
 
 	break;
       }
@@ -7756,7 +8087,7 @@ int DigField(struct PlayerInfo *player,
 	player->programmed_action = move_direction;
 	DOUBLE_PLAYER_SPEED(player);
 
-	PlaySoundLevelAction(x, y, ACTION_PASSING);
+	PlayLevelSoundAction(x, y, ACTION_PASSING);
 
 	break;
       }
@@ -7775,7 +8106,7 @@ int DigField(struct PlayerInfo *player,
 	  player->is_digging = TRUE;
 	}
 
-	PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING);
+	PlayLevelSoundElementAction(x, y, element, ACTION_DIGGING);
 
 	CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_DIGGED);
 
@@ -7854,7 +8185,7 @@ int DigField(struct PlayerInfo *player,
 	{
 	  int i;
 
-	  for (i=0; i < element_info[element].collect_count; i++)
+	  for (i = 0; i < element_info[element].collect_count; i++)
 	    if (player->inventory_size < MAX_INVENTORY_SIZE)
 	      player->inventory_element[player->inventory_size++] = element;
 
@@ -7873,7 +8204,7 @@ int DigField(struct PlayerInfo *player,
 	}
 
 	RaiseScoreElement(element);
-	PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING);
+	PlayLevelSoundElementAction(x, y, element, ACTION_COLLECTING);
 
 	CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_COLLECTED);
 
@@ -7997,23 +8328,23 @@ int DigField(struct PlayerInfo *player,
 	  Feld[x][y] = EL_SOKOBAN_OBJECT;
 
 	  if (Back[x][y] == Back[nextx][nexty])
-	    PlaySoundLevelAction(x, y, ACTION_PUSHING);
+	    PlayLevelSoundAction(x, y, ACTION_PUSHING);
 	  else if (Back[x][y] != 0)
-	    PlaySoundLevelElementAction(x, y, EL_SOKOBAN_FIELD_FULL,
+	    PlayLevelSoundElementAction(x, y, EL_SOKOBAN_FIELD_FULL,
 					ACTION_EMPTYING);
 	  else
-	    PlaySoundLevelElementAction(nextx, nexty, EL_SOKOBAN_FIELD_EMPTY,
+	    PlayLevelSoundElementAction(nextx, nexty, EL_SOKOBAN_FIELD_EMPTY,
 					ACTION_FILLING);
 
 	  if (local_player->sokobanfields_still_needed == 0 &&
 	      game.emulation == EMU_SOKOBAN)
 	  {
 	    player->LevelSolved = player->GameOver = TRUE;
-	    PlaySoundLevel(x, y, SND_GAME_SOKOBAN_SOLVING);
+	    PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING);
 	  }
 	}
 	else
-	  PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
+	  PlayLevelSoundElementAction(x, y, element, ACTION_PUSHING);
 
 	InitMovingField(x, y, move_direction);
 	GfxAction[x][y] = ACTION_PUSHING;
@@ -8047,7 +8378,7 @@ int DigField(struct PlayerInfo *player,
 	player->switch_x = x;
 	player->switch_y = y;
 
-	PlaySoundLevelElementAction(x, y, element, ACTION_ACTIVATING);
+	PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVATING);
 
 	if (element == EL_ROBOT_WHEEL)
 	{
@@ -8061,7 +8392,7 @@ int DigField(struct PlayerInfo *player,
 	{
 	  int xx, yy;
 
-	  for (yy=0; yy < lev_fieldy; yy++) for (xx=0; xx < lev_fieldx; xx++)
+	  for (yy = 0; yy < lev_fieldy; yy++) for (xx=0; xx < lev_fieldx; xx++)
 	  {
 	    if (Feld[xx][yy] == EL_SP_DISK_YELLOW)
 	      Bang(xx, yy);
@@ -8084,7 +8415,7 @@ int DigField(struct PlayerInfo *player,
 	  ToggleLightSwitch(x, y);
 
 #if 0
-	  PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ?
+	  PlayLevelSound(x, y, element == EL_LIGHT_SWITCH ?
 			 SND_LIGHT_SWITCH_ACTIVATING :
 			 SND_LIGHT_SWITCH_DEACTIVATING);
 #endif
@@ -8265,7 +8596,7 @@ boolean DropElement(struct PlayerInfo *player)
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
       DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0);
 
-    PlaySoundLevelAction(jx, jy, ACTION_DROPPING);
+    PlayLevelSoundAction(jx, jy, ACTION_DROPPING);
 
     CheckTriggeredElementChange(jx, jy, new_element, CE_OTHER_GETS_DROPPED);
     CheckElementChange(jx, jy, new_element, CE_DROPPED_BY_PLAYER);
@@ -8282,7 +8613,7 @@ boolean DropElement(struct PlayerInfo *player)
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
       DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0);
 
-    PlaySoundLevelAction(jx, jy, ACTION_DROPPING);
+    PlayLevelSoundAction(jx, jy, ACTION_DROPPING);
   }
 
   return TRUE;
@@ -8295,7 +8626,7 @@ boolean DropElement(struct PlayerInfo *player)
 static int *loop_sound_frame = NULL;
 static int *loop_sound_volume = NULL;
 
-void InitPlaySoundLevel()
+void InitPlayLevelSound()
 {
   int num_sounds = getSoundListSize();
 
@@ -8309,7 +8640,7 @@ void InitPlaySoundLevel()
   loop_sound_volume = checked_calloc(num_sounds * sizeof(int));
 }
 
-static void PlaySoundLevel(int x, int y, int nr)
+static void PlayLevelSound(int x, int y, int nr)
 {
   int sx = SCREENX(x), sy = SCREENY(y);
   int volume, stereo_position;
@@ -8354,37 +8685,46 @@ static void PlaySoundLevel(int x, int y, int nr)
   PlaySoundExt(nr, volume, stereo_position, type);
 }
 
-static void PlaySoundLevelNearest(int x, int y, int sound_action)
+static void PlayLevelSoundNearest(int x, int y, int sound_action)
 {
-  PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) :
+  PlayLevelSound(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 action)
+static void PlayLevelSoundAction(int x, int y, int action)
 {
-  PlaySoundLevelElementAction(x, y, Feld[x][y], action);
+  PlayLevelSoundElementAction(x, y, Feld[x][y], action);
 }
 
-static void PlaySoundLevelElementAction(int x, int y, int element, int action)
+static void PlayLevelSoundElementAction(int x, int y, int element, int action)
 {
   int sound_effect = element_info[element].sound[action];
 
   if (sound_effect != SND_UNDEFINED)
-    PlaySoundLevel(x, y, sound_effect);
+    PlayLevelSound(x, y, sound_effect);
 }
 
-static void PlaySoundLevelActionIfLoop(int x, int y, int action)
+static void PlayLevelSoundElementActionIfLoop(int x, int y, int element,
+					      int action)
+{
+  int sound_effect = element_info[element].sound[action];
+
+  if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect))
+    PlayLevelSound(x, y, sound_effect);
+}
+
+static void PlayLevelSoundActionIfLoop(int x, int y, int action)
 {
   int sound_effect = element_info[Feld[x][y]].sound[action];
 
   if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect))
-    PlaySoundLevel(x, y, sound_effect);
+    PlayLevelSound(x, y, sound_effect);
 }
 
-static void StopSoundLevelActionIfLoop(int x, int y, int action)
+static void StopLevelSoundActionIfLoop(int x, int y, int action)
 {
   int sound_effect = element_info[Feld[x][y]].sound[action];
 
@@ -8392,6 +8732,14 @@ static void StopSoundLevelActionIfLoop(int x, int y, int action)
     StopSoundExt(sound_effect, SND_CTRL_STOP_SOUND);
 }
 
+static void PlayLevelMusic()
+{
+  if (levelset.music[level_nr] != MUS_UNDEFINED)
+    PlayMusic(levelset.music[level_nr]);	/* from config file */
+  else
+    PlayMusic(MAP_NOCONF_MUSIC(level_nr));	/* from music dir */
+}
+
 void RaiseScore(int value)
 {
   local_player->score += value;
@@ -8553,7 +8901,7 @@ void CreateGameButtons()
 {
   int i;
 
-  for (i=0; i<NUM_GAME_BUTTONS; i++)
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
   {
     Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     struct GadgetInfo *gi;
@@ -8619,7 +8967,7 @@ void FreeGameButtons()
 {
   int i;
 
-  for (i=0; i<NUM_GAME_BUTTONS; i++)
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
     FreeGadget(game_gadget[i]);
 }
 
@@ -8627,7 +8975,7 @@ static void MapGameButtons()
 {
   int i;
 
-  for (i=0; i<NUM_GAME_BUTTONS; i++)
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
     MapGadget(game_gadget[i]);
 }
 
@@ -8635,7 +8983,7 @@ void UnmapGameButtons()
 {
   int i;
 
-  for (i=0; i<NUM_GAME_BUTTONS; i++)
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
     UnmapGadget(game_gadget[i]);
 }
 
@@ -8692,7 +9040,8 @@ static void HandleGameButtons(struct GadgetInfo *gi)
 	setup.sound = setup.sound_music = TRUE;
 
 	SetAudioMode(setup.sound);
-	PlayMusic(level_nr);
+
+	PlayLevelMusic();
       }
       break;