rnd-20030618-2-src

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index 6eb4590233328c519aff73d569b383a110a00e61..fc2ad2a5330bbdcd0f357d28a9d98a957f9c0375 100644 (file)
--- a/src/conf_e2s.c
+++ b/src/conf_e2s.c
@@ -221,8 +221,8 @@ element_to_sound[] =
     SND_CLASS_SOKOBAN_EMPTYING
   },
   {
-    EL_EMPTY_SPACE, FALSE,                     ACTION_DIGGING,
-    SND_EMPTY_SPACE_DIGGING
+    EL_PLAYER_OBSOLETE, TRUE,                  ACTION_MOVING,
+    SND_CLASS_PLAYER_MOVING
   },
   {
     EL_SAND, FALSE,                            ACTION_DIGGING,

diff --git a/src/conf_snd.c b/src/conf_snd.c
index 39270885c651b82ed226711b36e19d7ec20a4fee..799ab6ca89e8e5164dae89fae7ebeca4552ce271 100644 (file)
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -83,7 +83,8 @@ struct ConfigInfo sound_config[] =
   { "[sokoban].emptying",              UNDEFINED_FILENAME      },
 
   /* sounds for Emerald Mine style elements and actions */
-  { "empty_space.digging",             "empty.wav"             },
+  { "[player].moving",                 "empty.wav"             },
+  { "[player].moving.mode_loop",       "false"                 },
   { "sand.digging",                    "schlurf.wav"           },
   { "emerald.collecting",              "pong.wav"              },
   { "emerald.impact",                  "pling.wav"             },

diff --git a/src/conf_snd.h b/src/conf_snd.h
index 76486b633f8cccfb65d8a0757af24ea38f8f2437..e34b2968132c43c2ee42fc3070859a71db02f618 100644 (file)
--- a/src/conf_snd.h
+++ b/src/conf_snd.h
@@ -64,7 +64,7 @@
 #define SND_CLASS_SOKOBAN_PUSHING                              43
 #define SND_CLASS_SOKOBAN_FILLING                              44
 #define SND_CLASS_SOKOBAN_EMPTYING                             45
-#define SND_EMPTY_SPACE_DIGGING                                46
+#define SND_CLASS_PLAYER_MOVING                                        46
 #define SND_SAND_DIGGING                                       47
 #define SND_EMERALD_COLLECTING                         48
 #define SND_EMERALD_IMPACT                                     49

diff --git a/src/conftime.h b/src/conftime.h
index c4658ed92cfb1e3e1d9209e22cb268f5fffa990f..e4806697c202de9fc8a774575bd9a3433963dcfd 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-06-18 00:47]"
+#define COMPILE_DATE_STRING "[2003-06-18 01:29]"

diff --git a/src/game.c b/src/game.c
index 3c3f144b751a0b82601d37ec76442a261a1c3717..218c47f0b59bfc26ce7ec4e5e3ec8a2070500e3b 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -6380,7 +6380,13 @@ int DigField(struct PlayerInfo *player,
 
   switch (element)
   {
+#if 0
     case EL_EMPTY:
+      PlaySoundLevelElementAction(x, y, player->element_nr, ACTION_MOVING);
+      break;
+#endif
+
+#if 0
     case EL_SAND:
     case EL_INVISIBLE_SAND:
     case EL_INVISIBLE_SAND_ACTIVE:
@@ -6389,15 +6395,16 @@ int DigField(struct PlayerInfo *player,
     case EL_SP_BUGGY_BASE:
     case EL_SP_BUGGY_BASE_ACTIVATING:
       RemoveField(x, y);
-#if 1
+
       if (mode != DF_SNAP && element != EL_EMPTY)
       {
        GfxElement[x][y] = (CAN_BE_CRUMBLED(element) ? EL_SAND : element);
        player->is_digging = TRUE;
       }
-#endif
+
       PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING);
       break;
+#endif
 
     case EL_EMERALD:
     case EL_BD_DIAMOND:
@@ -6409,13 +6416,13 @@ int DigField(struct PlayerInfo *player,
     case EL_PEARL:
     case EL_CRYSTAL:
       RemoveField(x, y);
-#if 1
+
       if (mode != DF_SNAP)
       {
        GfxElement[x][y] = element;
        player->is_collecting = TRUE;
       }
-#endif
+
       local_player->gems_still_needed -= (element == EL_DIAMOND ? 3 :
                                          element == EL_PEARL ? 5 :
                                          element == EL_CRYSTAL ? 8 : 1);
@@ -6439,6 +6446,7 @@ int DigField(struct PlayerInfo *player,
       CheckTriggeredElementChange(element, CE_OTHER_COLLECTING);
       break;
 
+#if 0
     case EL_ENVELOPE:
       Feld[x][y] = EL_EMPTY;
 #if 1
@@ -6448,6 +6456,7 @@ int DigField(struct PlayerInfo *player,
 #endif
       CheckTriggeredElementChange(element, CE_OTHER_COLLECTING);
       break;
+#endif
 
     case EL_EXTRA_TIME:
       RemoveField(x, y);
@@ -6941,8 +6950,10 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
+#if 0
     case EL_SOKOBAN_FIELD_EMPTY:
       break;
+#endif
 
     case EL_SOKOBAN_OBJECT:
     case EL_SOKOBAN_FIELD_FULL:
@@ -7053,19 +7064,20 @@ int DigField(struct PlayerInfo *player,
 
       if (IS_WALKABLE(element))
       {
+       PlaySoundLevelElementAction(x, y, player->element_nr, ACTION_MOVING);
        break;
       }
       else if (IS_DIGGABLE(element))
       {
        RemoveField(x, y);
-#if 1
+
        if (mode != DF_SNAP)
        {
          GfxElement[x][y] =
            (CAN_BE_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element));
          player->is_digging = TRUE;
        }
-#endif
+
        PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING);
 
        break;
@@ -7073,13 +7085,13 @@ int DigField(struct PlayerInfo *player,
       else if (IS_COLLECTIBLE(element))
       {
        RemoveField(x, y);
-#if 1
+
        if (mode != DF_SNAP)
        {
          GfxElement[x][y] = element;
          player->is_collecting = TRUE;
        }
-#endif
+
        PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING);
 
        CheckTriggeredElementChange(element, CE_OTHER_COLLECTING);