diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
index eaa73302b..309920928 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
@@ -21,9 +21,9 @@ namespace Barotrauma
if (impact > 3.0f && limb.SoundTimer <= 0.0f)
{
limb.SoundTimer = Limb.SoundInterval;
- if (!string.IsNullOrWhiteSpace(limb.HitSound))
+ if (!string.IsNullOrWhiteSpace(limb.HitSoundTag))
{
- SoundPlayer.PlaySound(limb.HitSound, volume, impact * 100.0f, limb.WorldPosition);
+ SoundPlayer.PlaySound(limb.HitSoundTag, volume, impact * 100.0f, limb.WorldPosition);
}
foreach (WearableSprite wearable in limb.WearingItems)
{
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
index c75c13e07..0b98f2619 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
@@ -17,11 +17,11 @@ namespace Barotrauma
private set;
}
- private string hitSound;
+ private string hitSoundTag;
- public string HitSound
+ public string HitSoundTag
{
- get { return hitSound; }
+ get { return hitSoundTag; }
}
partial void InitProjSpecific(XElement element)
@@ -34,7 +34,12 @@ namespace Barotrauma
LightSource = new LightSource(subElement);
break;
case "sound":
- hitSound = subElement.GetAttributeString("file", "");
+ hitSoundTag = subElement.GetAttributeString("tag", "");
+ if (string.IsNullOrWhiteSpace(hitSoundTag))
+ {
+ //legacy support
+ hitSoundTag = subElement.GetAttributeString("file", "");
+ }
break;
}
}
diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Crawler/crawler.xml b/Barotrauma/BarotraumaShared/Content/Characters/Crawler/crawler.xml
index 45cd1f962..569e0d317 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Crawler/crawler.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Crawler/crawler.xml
@@ -59,7 +59,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml b/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml
index 929e6f009..973571620 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml
@@ -65,7 +65,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Human/humanhusk.xml b/Barotrauma/BarotraumaShared/Content/Characters/Human/humanhusk.xml
index ae252d2e7..a65381c00 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Human/humanhusk.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Human/humanhusk.xml
@@ -73,7 +73,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml b/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml
index 64f66a84d..860715a22 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml
@@ -76,7 +76,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Mantis/mantis.xml b/Barotrauma/BarotraumaShared/Content/Characters/Mantis/mantis.xml
index 1207f2fbc..81d6748bd 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Mantis/mantis.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Mantis/mantis.xml
@@ -61,14 +61,14 @@
-
+
-
+
@@ -76,7 +76,7 @@
-
+
@@ -84,7 +84,7 @@
-
+