From: Holger Schemel <info@artsoft.org>
Date: Wed, 18 Jun 2003 00:07:00 +0000 (+0200)
Subject: rnd-20030618-2-src
X-Git-Tag: 3.0.0^2~45
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=ffda824157292e928e191ac15981652ad745e7c4;p=rocksndiamonds.git

rnd-20030618-2-src
---

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index 6eb45902..fc2ad2a5 100644
--- 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 39270885..799ab6ca 100644
--- 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 76486b63..e34b2968 100644
--- 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 c4658ed9..e4806697 100644
--- 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 3c3f144b..218c47f0 100644
--- 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);