vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only the largest firesource within a hull plays a sound

Browse Source
This commit is contained in:
Regalis
2016-05-22 01:32:23 +03:00
parent 00b1ec38e2
commit c2f1a1a383
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Map/FireSource.cs
+26 -10
View File
@@ -144,19 +144,35 @@ namespace Barotrauma
{ {
float count = Rand.Range(0.0f, size.X/50.0f); float count = Rand.Range(0.0f, size.X/50.0f);
if (fireSoundBasic != null) if (hull.FireSources.Any(fs => fs != this && fs.size.X > size.X))
{ {
basicSoundIndex = fireSoundBasic.Loop(basicSoundIndex, if (basicSoundIndex > 0)
Math.Min(size.X / 100.0f, 1.0f), position + size / 2.0f, 1000.0f); {
Sounds.SoundManager.Stop(basicSoundIndex);
basicSoundIndex = -1;
}
if (largeSoundIndex > 0)
{
Sounds.SoundManager.Stop(largeSoundIndex);
largeSoundIndex = -1;
}
}
else
{
if (fireSoundBasic != null)
{
basicSoundIndex = fireSoundBasic.Loop(basicSoundIndex,
Math.Min(size.X / 100.0f, 1.0f), WorldPosition + size / 2.0f, 1000.0f);
}
if (fireSoundLarge != null)
{
largeSoundIndex = fireSoundLarge.Loop(largeSoundIndex,
MathHelper.Clamp((size.X - 200.0f) / 100.0f, 0.0f, 1.0f), WorldPosition + size / 2.0f, 1000.0f);
}
} }
if (fireSoundLarge != null)
{ if (size.X > 50.0f)
largeSoundIndex = fireSoundLarge.Loop(largeSoundIndex,
MathHelper.Clamp((size.X - 200.0f) / 100.0f, 0.0f, 1.0f), position + size / 2.0f, 1000.0f);
}
if (size.X>50.0f)
{ {
this.position.Y = MathHelper.Lerp(this.position.Y, hull.Rect.Y - hull.Rect.Height, deltaTime); this.position.Y = MathHelper.Lerp(this.position.Y, hull.Rect.Y - hull.Rect.Height, deltaTime);
} }