changed order of functions in EM engine source file
[rocksndiamonds.git] / src / game_em / synchro_1.c
index 695d52f378875387336beb665f990a8df5fb4836..56d4c6ce17b18b468d6dc408906c160a8e33bb50 100644 (file)
  * large switch statement for tiles the player interacts with.
  */
 
-#include "tile.h"
-#include "level.h"
-#include "sample.h"
+#include "main_em.h"
 
 
-static void player(struct PLAYER *);
-static int test(struct PLAYER *);
-static void die(struct PLAYER *);
+#define USE_CHANGED_ACID_STUFF         1
+
+static void check_player(struct PLAYER *);
+static void kill_player(struct PLAYER *);
+static boolean player_digfield(struct PLAYER *, int, int);
+static boolean player_killed(struct PLAYER *);
 
 void synchro_1(void)
 {
- /* must test for death and actually kill separately */
-  char ply1_kill = test(&ply1);
-  char ply2_kill = test(&ply2);
-
-  if (ply1.alive && ply1_kill)
-    die(&ply1);
-  if (ply2.alive && ply2_kill)
-    die(&ply2);
-
-#if 0
-  ply1.alive = 1; /* debugging */
-#endif
+  int start_check_nr;
+  int i;
 
-  ply1.oldx = ply1.x;
-  ply1.oldy = ply1.y;
-  ply1.anim = SPR_still;
-  ply2.oldx = ply2.x;
-  ply2.oldy = ply2.y;
-  ply2.anim = SPR_still;
+  game_em.any_player_moving = FALSE;
+  game_em.any_player_snapping = FALSE;
 
-  if (Random & 256)
+  /* must test for death and actually kill separately */
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    if (ply1.alive) player(&ply1);
-    if (ply2.alive) player(&ply2);
+    boolean ply_kill = player_killed(&ply[i]);
+
+    if (ply[i].alive && ply_kill)
+      kill_player(&ply[i]);
   }
-  else
+
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    if (ply2.alive) player(&ply2);
-    if (ply1.alive) player(&ply1);
+    ply[i].oldx = ply[i].x;
+    ply[i].oldy = ply[i].y;
+    ply[i].anim = PLY_still;
   }
 
-  if (ply1.alive)
+  start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1);
+
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    if (Cave[ply1.oldy][ply1.oldx] == Zplayer)
-    {
-      Cave[ply1.oldy][ply1.oldx] = Xblank;
-      Next[ply1.oldy][ply1.oldx] = Xblank;
-    }
+    int check_nr = (start_check_nr + i) % MAX_PLAYERS;
 
-    if (Cave[ply1.y][ply1.x] == Xblank)
-    {
-      Cave[ply1.y][ply1.x] = Zplayer;
-      Next[ply1.y][ply1.x] = Zplayer;
-    }
+    if (ply[check_nr].alive)
+      check_player(&ply[check_nr]);
   }
 
-  if (ply2.alive)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    if (Cave[ply2.oldy][ply2.oldx] == Zplayer)
+    if (!ply[i].alive)
+      continue;
+
+    if (Cave[ply[i].oldx][ply[i].oldy] == Zplayer)
     {
-      Cave[ply2.oldy][ply2.oldx] = Xblank;
-      Next[ply2.oldy][ply2.oldx] = Xblank;
+      Cave[ply[i].oldx][ply[i].oldy] = Xblank;
+      Next[ply[i].oldx][ply[i].oldy] = Xblank;
     }
 
-    if (Cave[ply2.y][ply2.x] == Xblank)
+    if (Cave[ply[i].x][ply[i].y] == Xblank)
     {
-      Cave[ply2.y][ply2.x] = Zplayer;
-      Next[ply2.y][ply2.x] = Zplayer;
+      Cave[ply[i].x][ply[i].y] = Zplayer;
+      Next[ply[i].x][ply[i].y] = Zplayer;
     }
   }
 }
 
-static int test(struct PLAYER *ply)
+static boolean player_killed(struct PLAYER *ply)
 {
-  register unsigned int x = ply->x;
-  register unsigned int y = ply->y;
+  int x = ply->x;
+  int y = ply->y;
+
+  if (!ply->alive)
+    return FALSE;
 
-  if (lev.time == 0)
-    return(1);
+  if (lev.killed_out_of_time && setup.time_limit)
+    return TRUE;
 
-  switch(Cave[y-1][x])
+  switch(Cave[x][y-1])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      return(1);
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      return TRUE;
   }
 
-  switch(Cave[y][x+1])
+  switch(Cave[x+1][y])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      return(1);
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      return TRUE;
   }
 
-  switch(Cave[y+1][x])
+  switch(Cave[x][y+1])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      return(1);
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      return TRUE;
   }
 
-  switch(Cave[y][x-1])
+  switch(Cave[x-1][y])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      return(1);
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      return TRUE;
   }
 
-  switch(Cave[y][x])
+  switch(Cave[x][y])
   {
     case Xblank:
-    case Yacid_splash_eB:
-    case Yacid_splash_wB:
+    case Xacid_splash_e:
+    case Xacid_splash_w:
     case Zplayer:
     case Xdynamite_1:
     case Xdynamite_2:
     case Xdynamite_3:
     case Xdynamite_4:
-      return(0);
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
+#endif
+      return FALSE;
   }
 
-  return(1);
+  return TRUE;
 }
 
-static void die(struct PLAYER *ply)
+static void kill_player(struct PLAYER *ply)
 {
-  register unsigned int x = ply->x;
-  register unsigned int y = ply->y;
+  int x = ply->x;
+  int y = ply->y;
 
   ply->alive = 0;
 
-  switch(Cave[y-1][x])
+  switch(Cave[x][y-1])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-      Cave[y-1][x] = Xboom_bug;
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+      Cave[x][y-1] = Xboom_bug;
       break;
 
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      Cave[y-1][x] = Xboom_bomb;
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      Cave[x][y-1] = Xboom_bomb;
       break;
   }
 
-  switch(Cave[y][x+1])
+  switch(Cave[x+1][y])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-      Cave[y][x+1] = Xboom_bug;
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+      Cave[x+1][y] = Xboom_bug;
       break;
 
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      Cave[y][x+1] = Xboom_bomb;
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      Cave[x+1][y] = Xboom_bomb;
       break;
   }
 
-  switch(Cave[y+1][x])
+  switch(Cave[x][y+1])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-      Cave[y+1][x] = Xboom_bug;
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+      Cave[x][y+1] = Xboom_bug;
       break;
 
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      Cave[y+1][x] = Xboom_bomb;
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      Cave[x][y+1] = Xboom_bomb;
       break;
   }
 
-  switch(Cave[y][x-1])
+  switch(Cave[x-1][y])
   {
-    case Xbug_n:
-    case Xbug_e:
-    case Xbug_s:
-    case Xbug_w:
-    case Xbug_gon:
-    case Xbug_goe:
-    case Xbug_gos:
-    case Xbug_gow:
-      Cave[y][x-1] = Xboom_bug;
+    case Xbug_1_n:
+    case Xbug_1_e:
+    case Xbug_1_s:
+    case Xbug_1_w:
+    case Xbug_2_n:
+    case Xbug_2_e:
+    case Xbug_2_s:
+    case Xbug_2_w:
+      Cave[x-1][y] = Xboom_bug;
       break;
 
-    case Xtank_n:
-    case Xtank_e:
-    case Xtank_s:
-    case Xtank_w:
-    case Xtank_gon:
-    case Xtank_goe:
-    case Xtank_gos:
-    case Xtank_gow:
-      Cave[y][x-1] = Xboom_bomb;
+    case Xtank_1_n:
+    case Xtank_1_e:
+    case Xtank_1_s:
+    case Xtank_1_w:
+    case Xtank_2_n:
+    case Xtank_2_e:
+    case Xtank_2_s:
+    case Xtank_2_w:
+      Cave[x-1][y] = Xboom_bomb;
       break;
   }
 
-  switch(Cave[y][x])
+  switch(Cave[x][y])
   {
     case Xexit_1:
     case Xexit_2:
     case Xexit_3:
-      play[SAMPLE_exit] = 1;
+      lev.exit_x = x;
+      lev.exit_y = y;
+      play_element_sound(x, y, SOUND_exit_leave, Xexit_1);
       break;
 
     default:
-      play[SAMPLE_die] = 1;
+      play_element_sound(x, y, SOUND_die, Zplayer);
       break;
   }
 
-  Cave[y][x] = Xboom_1;
-  Boom[y][x] = Xblank;
+  switch(Cave[x][y])
+  {
+#if USE_CHANGED_ACID_STUFF
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      break;
+#endif
+
+    default:
+      Cave[x][y] = Xboom_1;
+      Boom[x][y] = Xblank;
+      break;
+  }
 }
 
-static void player(struct PLAYER *ply)
+static void check_player(struct PLAYER *ply)
 {
-  register unsigned int x = ply->x;
-  register unsigned int y = ply->y;
-  unsigned int anim = 0;       /* initialized to make compilers happy */
+  int oldx = ply->x;
+  int oldy = ply->y;
+  int x = oldx;
+  int y = oldy;
   int dx = 0, dy = 0;
 
-  if ((ply->joy_spin = !ply->joy_spin))
+  game_em.last_player_direction[ply->num] = MV_NONE;
+
+  if (ply->joy_w)              /* west */
   {
-    if (ply->joy_n)
-    {
-      y--;
-      dy = -1;
-      anim = 0;
-      /* north */
-    }
-    else if (ply->joy_e)
-    {
-      x++;
-      dx = 1;
-      anim = 1;
-      /* east */
-    }
-    else if (ply->joy_s)
-    {
-      y++;
-      dy = 1;
-      anim = 2;
-      /* south */
-    }
-    else if (ply->joy_w)
-    {
-      x--;
-      dx = -1;
-      anim = 3;
-      /* west */
-    }
+    x--;
+    dx = -1;
   }
-  else
+  else if (ply->joy_e)         /* east */
   {
-    if (ply->joy_w)
-    {
-      x--;
-      dx = -1;
-      anim = 3;
-      /* west */
-    }
-    else if (ply->joy_s)
-    {
-      y++;
-      dy = 1;
-      anim = 2;
-      /* south */
-    }
-    else if (ply->joy_e)
-    {
-      x++;
-      dx = 1;
-      anim = 1;
-      /* east */
-    }
-    else if (ply->joy_n)
+    x++;
+    dx = 1;
+  }
+
+  if (ply->joy_n)              /* north */
+  {
+    y--;
+    dy = -1;
+  }
+  else if (ply->joy_s)         /* south */
+  {
+    y++;
+    dy = 1;
+  }
+
+  if (dx || dy)
+  {
+    int oldx = ply->x;
+    int oldy = ply->y;
+    int x = oldx + dx;
+    int y = oldy + dy;
+    boolean players_visible_before_move;
+    boolean players_visible_after_move;
+    boolean can_move;
+
+    players_visible_before_move = checkIfAllPlayersFitToScreen();
+
+    ply->x = x;
+    ply->y = y;
+
+    players_visible_after_move = checkIfAllPlayersFitToScreen();
+
+    /*
+      player is allowed to move only in the following cases:
+      - it is not needed to display all players (not focussed to all players)
+      - all players are (still or again) visible after the move
+      - some players were already outside visible screen area before the move
+    */
+    can_move = (game.centered_player_nr != -1 ||
+               players_visible_after_move ||
+               !players_visible_before_move);
+
+    ply->x = oldx;
+    ply->y = oldy;
+
+    if (!can_move)
     {
-      y--;
-      dy = -1;
-      anim = 0;
-      /* north */
+      ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+
+      return;
     }
   }
 
@@ -384,12 +406,12 @@ static void player(struct PLAYER *ply)
   {
     ply->joy_stick = 0;
 
-    if (ply->joy_fire)
+    if (ply->joy_drop)
     {
       if (++ply->dynamite_cnt == 5 && ply->dynamite)
       {
-       Cave[y][x] = Xdynamite_1;
-       play[SAMPLE_dynamite] = 1;
+       Cave[x][y] = Xdynamite_1;
+       play_element_sound(x, y, SOUND_dynamite, Xdynamite_1);
        ply->dynamite--;
       }
     }
@@ -398,49 +420,128 @@ static void player(struct PLAYER *ply)
       ply->dynamite_cnt = 0;
     }
 
-    Random += 7; /* bit more random if we dont move */
+    RandomEM += 7;     /* be a bit more random if the player doesn't move */
 
     return;
   }
 
   ply->joy_stick = 1;
   ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
-  ply->dynamite_cnt = 0; /* reset dynamite timer if we move */
+  ply->dynamite_cnt = 0;       /* reset dynamite timer if we move */
+  ply->joy_spin = !ply->joy_spin;
+
+  if (ply->joy_snap == 0)              /* player wants to move */
+  {
+    boolean moved = FALSE;
+
+    if (ply->last_move_dir & MV_HORIZONTAL)
+    {
+      if (!(moved = player_digfield(ply, 0, dy)))
+       moved = player_digfield(ply, dx, 0);
+    }
+    else
+    {
+      if (!(moved = player_digfield(ply, dx, 0)))
+       moved = player_digfield(ply, 0, dy);
+    }
+
+    if (moved)
+    {
+      if (oldx != ply->x)
+       ply->last_move_dir = (dx < 0 ? MV_LEFT : MV_RIGHT);
+      else if (oldy != ply->y)
+       ply->last_move_dir = (dy < 0 ? MV_UP : MV_DOWN);
+
+      game_em.any_player_moving = TRUE;
+      game_em.last_moving_player = ply->num;
+      game_em.last_player_direction[ply->num] = ply->last_move_dir;
+    }
+  }
+  else                                 /* player wants to snap */
+  {
+    game_em.any_player_snapping = player_digfield(ply, dx, dy);
+  }
+}
 
-  if (ply->joy_fire == 0)
+static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
+{
+  int anim = (dx < 0 ? 3 : dx > 0 ? 1 : dy < 0 ? 0 : dy > 0 ? 2 : 2);
+  int oldx = ply->x;
+  int oldy = ply->y;
+  int x = oldx + dx;
+  int y = oldy + dy;
+  boolean result = TRUE;
+
+  if (!dx && !dy)                      /* no direction specified */
+    return FALSE;
+
+  if (dx && dy && ply->joy_snap)       /* more than one direction specified */
+    return FALSE;
+
+  if (ply->joy_snap == 0)              /* player wants to move */
   {
-    switch(Cave[y][x])
+    int element = Cave[x][y];
+
+    switch(Cave[x][y])
     {
       /* fire is released */
       case Xblank:
-      case Yacid_splash_eB:
-      case Yacid_splash_wB:
-       Cave[y][x] = Zplayer;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_blank] = 1;
-       ply->anim = SPR_walk + anim;
+      case Xacid_splash_e:
+      case Xacid_splash_w:
+       Cave[x][y] = Zplayer;
+       Next[x][y] = Zplayer;
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+      case Xfake_acid_1:
+      case Xfake_acid_2:
+      case Xfake_acid_3:
+      case Xfake_acid_4:
+      case Xfake_acid_5:
+      case Xfake_acid_6:
+      case Xfake_acid_7:
+      case Xfake_acid_8:
+#endif
+       play_element_sound(x, y, SOUND_blank, Xblank);
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
+#if USE_CHANGED_ACID_STUFF
+      case Xacid_1:
+      case Xacid_2:
+      case Xacid_3:
+      case Xacid_4:
+      case Xacid_5:
+      case Xacid_6:
+      case Xacid_7:
+      case Xacid_8:
+       if (Cave[x+1][y-1] == Xblank)
+         Cave[x+1][y-1] = Xacid_splash_e;
+       if (Cave[x-1][y-1] == Xblank)
+         Cave[x-1][y-1] = Xacid_splash_w;
+       play_element_sound(x, y, SOUND_acid, Xacid_1);
+#endif
+
       case Xboom_android:
       case Xboom_1:
-      case Xbug_n:
-      case Xbug_e:
-      case Xbug_s:
-      case Xbug_w:
-      case Xbug_gon:
-      case Xbug_goe:
-      case Xbug_gos:
-      case Xbug_gow:
-      case Xtank_n:
-      case Xtank_e:
-      case Xtank_s:
-      case Xtank_w:
-      case Xtank_gon:
-      case Xtank_goe:
-      case Xtank_gos:
-      case Xtank_gow:
+      case Xbug_1_n:
+      case Xbug_1_e:
+      case Xbug_1_s:
+      case Xbug_1_w:
+      case Xbug_2_n:
+      case Xbug_2_e:
+      case Xbug_2_s:
+      case Xbug_2_w:
+      case Xtank_1_n:
+      case Xtank_1_e:
+      case Xtank_1_s:
+      case Xtank_1_w:
+      case Xtank_2_n:
+      case Xtank_2_e:
+      case Xtank_2_s:
+      case Xtank_2_w:
+
+#if !USE_CHANGED_ACID_STUFF
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -449,127 +550,137 @@ static void player(struct PLAYER *ply)
       case Xacid_6:
       case Xacid_7:
       case Xacid_8:
-       ply->anim = SPR_walk + anim;
+#endif
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xgrass:
-       Cave[y][x] = (dy ? (dy < 0 ? Ygrass_nB : Ygrass_sB) :
+       Cave[x][y] = (dy ? (dy < 0 ? Ygrass_nB : Ygrass_sB) :
                      (dx > 0 ? Ygrass_eB : Ygrass_wB));
-       Next[y][x] = Zplayer;
-       play[SAMPLE_dirt] = 1;
-       ply->anim = SPR_walk + anim;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_dirt, Xgrass);
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xdirt:
-       Cave[y][x] = (dy ? (dy < 0 ? Ydirt_nB : Ydirt_sB) :
+       Cave[x][y] = (dy ? (dy < 0 ? Ydirt_nB : Ydirt_sB) :
                      (dx > 0 ? Ydirt_eB : Ydirt_wB));
-       Next[y][x] = Zplayer;
-       play[SAMPLE_dirt] = 1;
-       ply->anim = SPR_walk + anim;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_dirt, Xdirt);
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xdiamond:
       case Xdiamond_pause:
-       Cave[y][x] = Ydiamond_eat;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ydiamond_blank;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.diamond_score;
        lev.required = lev.required < 3 ? 0 : lev.required - 3;
-       ply->anim = SPR_walk + anim;
+       game.snapshot.collected_item = TRUE;
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xemerald:
       case Xemerald_pause:
-       Cave[y][x] = Yemerald_eat;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Yemerald_blank;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.emerald_score;
        lev.required = lev.required < 1 ? 0 : lev.required - 1;
-       ply->anim = SPR_walk + anim;
+       game.snapshot.collected_item = TRUE;
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xdynamite:
-       Cave[y][x] = Ydynamite_eat;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ydynamite_blank;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.dynamite_score;
        ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xkey_1:
        ply->keys |= 0x01;
+       Cave[x][y] = Ykey_1_blank;
        goto key_walk;
 
       case Xkey_2:
        ply->keys |= 0x02;
+       Cave[x][y] = Ykey_2_blank;
        goto key_walk;
 
       case Xkey_3:
        ply->keys |= 0x04;
+       Cave[x][y] = Ykey_3_blank;
        goto key_walk;
 
       case Xkey_4:
        ply->keys |= 0x08;
+       Cave[x][y] = Ykey_4_blank;
        goto key_walk;
 
       case Xkey_5:
        ply->keys |= 0x10;
+       Cave[x][y] = Ykey_5_blank;
        goto key_walk;
 
       case Xkey_6:
        ply->keys |= 0x20;
+       Cave[x][y] = Ykey_6_blank;
        goto key_walk;
 
       case Xkey_7:
        ply->keys |= 0x40;
+       Cave[x][y] = Ykey_7_blank;
        goto key_walk;
 
       case Xkey_8:
        ply->keys |= 0x80;
+       Cave[x][y] = Ykey_8_blank;
        goto key_walk;
 
       key_walk:
 
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.key_score;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xlenses:
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ylenses_blank;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.lenses_score;
        lev.lenses_cnt = lev.lenses_time;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
 
       case Xmagnify:
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ymagnify_blank;
+       Next[x][y] = Zplayer;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.magnify_score;
        lev.magnify_cnt = lev.magnify_time;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
@@ -578,7 +689,7 @@ static void player(struct PLAYER *ply)
        if (dy)
          break;
 
-       switch(Cave[y][x+dx])
+       switch(Cave[x+dx][y])
        {
           case Xacid_1:
           case Xacid_2:
@@ -588,35 +699,35 @@ static void player(struct PLAYER *ply)
           case Xacid_6:
           case Xacid_7:
           case Xacid_8:
-           if (Cave[y-1][x+dx+1] == Xblank)
-             Cave[y-1][x+dx+1] = Yacid_splash_eB;
-           if (Cave[y-1][x+dx-1] == Xblank)
-             Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           if (Cave[x+dx+1][y-1] == Xblank)
+             Cave[x+dx+1][y-1] = Xacid_splash_e;
+           if (Cave[x+dx-1][y-1] == Xblank)
+             Cave[x+dx-1][y-1] = Xacid_splash_w;
+           play_element_sound(x, y, SOUND_acid, Xacid_1);
            goto stone_walk;
 
           case Xblank:
-          case Yacid_splash_eB:
-          case Yacid_splash_wB:
-           Cave[y][x+dx] = dx > 0 ? Ystone_e : Ystone_w;
-           Next[y][x+dx] = Xstone_pause;
+          case Xacid_splash_e:
+          case Xacid_splash_w:
+           Cave[x+dx][y] = dx > 0 ? Ystone_e : Ystone_w;
+           Next[x+dx][y] = Xstone_pause;
 
           stone_walk:
 
-           Cave[y][x] = dx > 0 ? Ystone_eB : Ystone_wB;
-           Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           Cave[x][y] = dx > 0 ? Ystone_eB : Ystone_wB;
+           Next[x][y] = Zplayer;
+           play_element_sound(x, y, SOUND_roll, Xstone);
            ply->x = x;
        }
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xbomb:
        if (dy)
          break;
 
-       switch(Cave[y][x+dx])
+       switch(Cave[x+dx][y])
        {
           case Xacid_1:
           case Xacid_2:
@@ -626,35 +737,35 @@ static void player(struct PLAYER *ply)
           case Xacid_6:
           case Xacid_7:
           case Xacid_8:
-           if (Cave[y-1][x+dx+1] == Xblank)
-             Cave[y-1][x+dx+1] = Yacid_splash_eB;
-           if (Cave[y-1][x+dx-1] == Xblank)
-             Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           if (Cave[x+dx+1][y-1] == Xblank)
+             Cave[x+dx+1][y-1] = Xacid_splash_e;
+           if (Cave[x+dx-1][y-1] == Xblank)
+             Cave[x+dx-1][y-1] = Xacid_splash_w;
+           play_element_sound(x, y, SOUND_acid, Xacid_1);
            goto bomb_walk;
 
          case Xblank:
-          case Yacid_splash_eB:
-          case Yacid_splash_wB:
-           Cave[y][x+dx] = dx > 0 ? Ybomb_e : Ybomb_w;
-           Next[y][x+dx] = Xbomb_pause;
+          case Xacid_splash_e:
+          case Xacid_splash_w:
+           Cave[x+dx][y] = dx > 0 ? Ybomb_e : Ybomb_w;
+           Next[x+dx][y] = Xbomb_pause;
 
           bomb_walk:
 
-           Cave[y][x] = dx > 0 ? Ybomb_eB : Ybomb_wB;
-           Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           Cave[x][y] = dx > 0 ? Ybomb_eB : Ybomb_wB;
+           Next[x][y] = Zplayer;
+           play_element_sound(x, y, SOUND_roll, Xbomb);
            ply->x = x;
        }
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xnut:
        if (dy)
          break;
 
-       switch(Cave[y][x+dx])
+       switch(Cave[x+dx][y])
        {
           case Xacid_1:
           case Xacid_2:
@@ -664,43 +775,43 @@ static void player(struct PLAYER *ply)
           case Xacid_6:
           case Xacid_7:
           case Xacid_8:
-           if (Cave[y-1][x+dx+1] == Xblank)
-             Cave[y-1][x+dx+1] = Yacid_splash_eB;
-           if (Cave[y-1][x+dx-1] == Xblank)
-             Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           if (Cave[x+dx+1][y-1] == Xblank)
+             Cave[x+dx+1][y-1] = Xacid_splash_e;
+           if (Cave[x+dx-1][y-1] == Xblank)
+             Cave[x+dx-1][y-1] = Xacid_splash_w;
+           play_element_sound(x, y, SOUND_acid, Xacid_1);
            goto nut_walk;
 
           case Xblank:
-          case Yacid_splash_eB:
-          case Yacid_splash_wB:
-           Cave[y][x+dx] = dx > 0 ? Ynut_e : Ynut_w;
-           Next[y][x+dx] = Xnut_pause;
+          case Xacid_splash_e:
+          case Xacid_splash_w:
+           Cave[x+dx][y] = dx > 0 ? Ynut_e : Ynut_w;
+           Next[x+dx][y] = Xnut_pause;
 
           nut_walk:
 
-           Cave[y][x] = dx > 0 ? Ynut_eB : Ynut_wB;
-           Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           Cave[x][y] = dx > 0 ? Ynut_eB : Ynut_wB;
+           Next[x][y] = Zplayer;
+           play_element_sound(x, y, SOUND_roll, Xnut);
            ply->x = x;
        }
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xspring:
        if (dy)
          break;
 
-       switch(Cave[y][x+dx])
+       switch(Cave[x+dx][y])
        {
           case Xalien:
           case Xalien_pause:
-           Cave[y][x] = dx > 0 ? Yspring_kill_eB : Yspring_kill_wB;
-           Cave[y][x+dx] = dx > 0 ? Yspring_kill_e : Yspring_kill_w;
-           Next[y][x] = Zplayer;
-           Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w;
-           play[SAMPLE_slurp] = 1;
+           Cave[x][y] = dx > 0 ? Yspring_alien_eB : Yspring_alien_wB;
+           Cave[x+dx][y] = dx > 0 ? Yspring_alien_e : Yspring_alien_w;
+           Next[x][y] = Zplayer;
+           Next[x+dx][y] = dx > 0 ? Xspring_e : Xspring_w;
+           play_element_sound(x, y, SOUND_slurp, Xalien);
            lev.score += lev.slurp_score;
            ply->x = x;
            break;
@@ -713,27 +824,27 @@ static void player(struct PLAYER *ply)
           case Xacid_6:
           case Xacid_7:
           case Xacid_8:
-           if (Cave[y-1][x+dx+1] == Xblank)
-             Cave[y-1][x+dx+1] = Yacid_splash_eB;
-           if (Cave[y-1][x+dx-1] == Xblank)
-             Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           if (Cave[x+dx+1][y-1] == Xblank)
+             Cave[x+dx+1][y-1] = Xacid_splash_e;
+           if (Cave[x+dx-1][y-1] == Xblank)
+             Cave[x+dx-1][y-1] = Xacid_splash_w;
+           play_element_sound(x, y, SOUND_acid, Xacid_1);
            goto spring_walk;
 
           case Xblank:
-          case Yacid_splash_eB:
-          case Yacid_splash_wB:
-           Cave[y][x+dx] = dx > 0 ? Yspring_e : Yspring_w;
-           Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w;
+          case Xacid_splash_e:
+          case Xacid_splash_w:
+           Cave[x+dx][y] = dx > 0 ? Yspring_e : Yspring_w;
+           Next[x+dx][y] = dx > 0 ? Xspring_e : Xspring_w;
 
          spring_walk:
-           Cave[y][x] = dx > 0 ? Yspring_eB : Yspring_wB;
-           Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           Cave[x][y] = dx > 0 ? Yspring_eB : Yspring_wB;
+           Next[x][y] = Zplayer;
+           play_element_sound(x, y, SOUND_roll, Xspring);
            ply->x = x;
        }
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xspring_pause:
@@ -747,11 +858,11 @@ static void player(struct PLAYER *ply)
        if (dy)
          break;
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xballoon:
-       switch(Cave[y+dy][x+dx])
+       switch(Cave[x+dx][y+dy])
        {
           case Xacid_1:
           case Xacid_2:
@@ -761,30 +872,30 @@ static void player(struct PLAYER *ply)
           case Xacid_6:
           case Xacid_7:
           case Xacid_8:
-           if (Cave[y+dy-1][x+dx+1] == Xblank)
-             Cave[y+dy-1][x+dx+1] = Yacid_splash_eB;
-           if (Cave[y+dy-1][x+dx-1] == Xblank)
-             Cave[y+dy-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           if (Cave[x+dx+1][y+dy-1] == Xblank)
+             Cave[x+dx+1][y+dy-1] = Xacid_splash_e;
+           if (Cave[x+dx-1][y+dy-1] == Xblank)
+             Cave[x+dx-1][y+dy-1] = Xacid_splash_w;
+           play_element_sound(x, y, SOUND_acid, Xacid_1);
            goto balloon_walk;
 
           case Xblank:
-          case Yacid_splash_eB:
-          case Yacid_splash_wB:
-           Cave[y+dy][x+dx] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) :
+          case Xacid_splash_e:
+          case Xacid_splash_w:
+           Cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) :
                                (dx > 0 ? Yballoon_e : Yballoon_w));
-           Next[y+dy][x+dx] = Xballoon;
+           Next[x+dx][y+dy] = Xballoon;
 
          balloon_walk:
-           Cave[y][x] = (dy ? (dy < 0 ? Yballoon_nB : Yballoon_sB) :
+           Cave[x][y] = (dy ? (dy < 0 ? Yballoon_nB : Yballoon_sB) :
                          (dx > 0 ? Yballoon_eB : Yballoon_wB));
-           Next[y][x] = Zplayer;
-           play[SAMPLE_push] = 1;
+           Next[x][y] = Zplayer;
+           play_element_sound(x, y, SOUND_push, Xballoon);
            ply->x = x;
            ply->y = y;
        }
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xandroid:
@@ -796,7 +907,7 @@ static void player(struct PLAYER *ply)
       case Xandroid_2_s:
       case Xandroid_1_w:
       case Xandroid_2_w:
-       switch(Cave[y+dy][x+dx])
+       switch(Cave[x+dx][y+dy])
        {
           case Xacid_1:
           case Xacid_2:
@@ -806,31 +917,31 @@ static void player(struct PLAYER *ply)
           case Xacid_6:
           case Xacid_7:
           case Xacid_8:
-           if (Cave[y+dy-1][x+dx+1] == Xblank)
-             Cave[y+dy-1][x+dx+1] = Yacid_splash_eB;
-           if (Cave[y+dy-1][x+dx-1] == Xblank)
-             Cave[y+dy-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           if (Cave[x+dx+1][y+dy-1] == Xblank)
+             Cave[x+dx+1][y+dy-1] = Xacid_splash_e;
+           if (Cave[x+dx-1][y+dy-1] == Xblank)
+             Cave[x+dx-1][y+dy-1] = Xacid_splash_w;
+           play_element_sound(x, y, SOUND_acid, Xacid_1);
            goto android_walk;
 
           case Xblank:
-          case Yacid_splash_eB:
-          case Yacid_splash_wB:
-           Cave[y+dy][x+dx] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) :
+          case Xacid_splash_e:
+          case Xacid_splash_w:
+           Cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) :
                                (dx > 0 ? Yandroid_e : Yandroid_w));
-           Next[y+dy][x+dx] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) :
+           Next[x+dx][y+dy] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) :
                                (dx > 0 ? Xandroid_2_e : Xandroid_2_w));
 
          android_walk:
-           Cave[y][x] = (dy ? (dy < 0 ? Yandroid_nB : Yandroid_sB) :
+           Cave[x][y] = (dy ? (dy < 0 ? Yandroid_nB : Yandroid_sB) :
                          (dx > 0 ? Yandroid_eB : Yandroid_wB));
-           Next[y][x] = Zplayer;
-           play[SAMPLE_push] = 1;
+           Next[x][y] = Zplayer;
+           play_element_sound(x, y, SOUND_push, Xandroid);
            ply->x = x;
            ply->y = y;
        }
 
-       ply->anim = SPR_push + anim;
+       ply->anim = PLY_push_n + anim;
        break;
 
       case Xdoor_1:
@@ -890,19 +1001,19 @@ static void player(struct PLAYER *ply)
          break;
 
       door_walk:
-       if (!tab_blank[Cave[y+dy][x+dx]])
+       if (!tab_blank[Cave[x+dx][y+dy]])
          break;
 
-       Cave[y+dy][x+dx] = Zplayer;
-       Next[y+dy][x+dx] = Zplayer;
-       play[SAMPLE_door] = 1;
-       ply->anim = SPR_walk + anim;
+       Cave[x+dx][y+dy] = Zplayer;
+       Next[x+dx][y+dy] = Zplayer;
+       play_element_sound(x, y, SOUND_door, element);
+       ply->anim = PLY_walk_n + anim;
        ply->x = x + dx;
        ply->y = y + dy;
        break;
 
       case Xwheel:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SOUND_press, element);
        lev.wheel_cnt = lev.wheel_time;
        lev.wheel_x = x;
        lev.wheel_y = y;
@@ -924,31 +1035,31 @@ static void player(struct PLAYER *ply)
        lev.wind_direction = 3;
        goto wind_walk;
 
-      case Xwind_nesw:
+      case Xwind_any:
        lev.wind_direction = dy ? (dy < 0 ? 0 : 2) : (dx > 0 ? 1 : 3);
        goto wind_walk;
 
       wind_walk:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SOUND_press, element);
        lev.wind_cnt = lev.wind_time;
        break;
 
       case Xwind_stop:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SOUND_press, element);
        lev.wind_cnt = 0;
        break;
 
       case Xswitch:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SOUND_press, element);
        lev.ball_cnt = lev.ball_time;
        lev.ball_state = !lev.ball_state;
        break;
 
       case Xplant:
-       Cave[y][x] = Yplant;
-       Next[y][x] = Xplant;
-       play[SAMPLE_blank] = 1;
-       ply->anim = SPR_walk + anim;
+       Cave[x][y] = Yplant;
+       Next[x][y] = Xplant;
+       play_element_sound(x, y, SOUND_blank, Xplant);
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
        break;
@@ -956,115 +1067,143 @@ static void player(struct PLAYER *ply)
       case Xexit_1:
       case Xexit_2:
       case Xexit_3:
-       play[SAMPLE_exit] = 1;
-       if (--lev.home == 0)
-         lev.score += lev.time * lev.exit_score / 100;
-       ply->anim = SPR_walk + anim;
+       lev.home--;
+
+       if (lev.home == 0)
+         game_em.level_solved = TRUE;
+
+       ply->anim = PLY_walk_n + anim;
        ply->x = x;
        ply->y = y;
+
        break;
     }
+
+    if (ply->x == oldx && ply->y == oldy)      /* no movement */
+      result = FALSE;
   }
-  else
+  else                                 /* player wants to snap */
   {
-    switch(Cave[y][x])
+    int element = Cave[x][y];
+
+    switch(Cave[x][y])
     {
       /* fire is pressed */
 
       case Xgrass:
+       Cave[x][y] = Ygrass_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_dirt, element);
+       ply->anim = PLY_shoot_n + anim;
+       break;
+
       case Xdirt:
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_dirt] = 1;
-       ply->anim = SPR_spray + anim;
+       Cave[x][y] = Ydirt_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_dirt, element);
+       ply->anim = PLY_shoot_n + anim;
        break;
 
       case Xdiamond:
       case Xdiamond_pause:
-       Cave[y][x] = Ydiamond_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ydiamond_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.diamond_score;
        lev.required = lev.required < 3 ? 0 : lev.required - 3;
-       ply->anim = SPR_walk + anim;
+       game.snapshot.collected_item = TRUE;
+       ply->anim = PLY_walk_n + anim;
        break;
 
       case Xemerald:
       case Xemerald_pause:
-       Cave[y][x] = Yemerald_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Yemerald_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.emerald_score;
        lev.required = lev.required < 1 ? 0 : lev.required - 1;
-       ply->anim = SPR_walk + anim;
+       game.snapshot.collected_item = TRUE;
+       ply->anim = PLY_walk_n + anim;
        break;
 
       case Xdynamite:
-       Cave[y][x] = Ydynamite_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ydynamite_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.dynamite_score;
        ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        break;
 
       case Xkey_1:
        ply->keys |= 0x01;
+       Cave[x][y] = Ykey_1_blank;
        goto key_shoot;
 
       case Xkey_2:
        ply->keys |= 0x02;
+       Cave[x][y] = Ykey_2_blank;
        goto key_shoot;
 
       case Xkey_3:
        ply->keys |= 0x04;
+       Cave[x][y] = Ykey_3_blank;
        goto key_shoot;
 
       case Xkey_4:
        ply->keys |= 0x08;
+       Cave[x][y] = Ykey_4_blank;
        goto key_shoot;
 
       case Xkey_5:
        ply->keys |= 0x10;
+       Cave[x][y] = Ykey_5_blank;
        goto key_shoot;
 
       case Xkey_6:
        ply->keys |= 0x20;
+       Cave[x][y] = Ykey_6_blank;
        goto key_shoot;
 
       case Xkey_7:
        ply->keys |= 0x40;
+       Cave[x][y] = Ykey_7_blank;
        goto key_shoot;
 
       case Xkey_8:
        ply->keys |= 0x80;
+       Cave[x][y] = Ykey_8_blank;
        goto key_shoot;
 
       key_shoot:
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.key_score;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        break;
 
       case Xlenses:
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ylenses_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.lenses_score;
        lev.lenses_cnt = lev.lenses_time;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        break;
 
       case Xmagnify:
-       Cave[y][x] = Yball_eat;
-       Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       Cave[x][y] = Ymagnify_blank;
+       Next[x][y] = Xblank;
+       play_element_sound(x, y, SOUND_collect, element);
        lev.score += lev.magnify_score;
        lev.magnify_cnt = lev.magnify_time;
-       ply->anim = SPR_walk + anim;
+       ply->anim = PLY_walk_n + anim;
        break;
+
+      default:
+       result = FALSE;
     }
   }
+
+  return result;
 }