epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3414 from Mailaender/sound.rs

Browse Source 
Added native support for Dune 2000 SOUND.RS packages
This commit is contained in:
Chris Forbes
2013-06-16 14:00:41 -07:00
parent 2deef04095 71616201ff
commit 5d733b8e45
82 changed files with 428 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Armament.cs
View File

@@ -146,7 +146,7 @@ namespace OpenRA.Mods.RA
self.World.Add(projectile);
if (args.weapon.Report != null && args.weapon.Report.Any())
Sound.Play(args.weapon.Report.Random(self.World.SharedRandom) + ".aud", self.CenterLocation);
Sound.Play(args.weapon.Report.Random(self.World.SharedRandom), self.CenterLocation);
}
});

2
OpenRA.Mods.RA/CarpetBomb.cs
View File

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA
self.World.Add(args.weapon.Projectile.Create(args));
if (args.weapon.Report != null && args.weapon.Report.Any())
Sound.Play(args.weapon.Report.Random(self.World.SharedRandom) + ".aud", self.CenterLocation);
Sound.Play(args.weapon.Report.Random(self.World.SharedRandom), self.CenterLocation);
}
}
}

6
OpenRA.Mods.RA/Combat.cs
View File

@@ -24,10 +24,10 @@ namespace OpenRA.Mods.RA
static string GetImpactSound(WarheadInfo warhead, bool isWater)
{
if (isWater && warhead.WaterImpactSound != null)
return warhead.WaterImpactSound + ".aud";
return warhead.WaterImpactSound;
if (warhead.ImpactSound != null)
return warhead.ImpactSound + ".aud";
return warhead.ImpactSound;
return null;
}
@@ -154,7 +154,7 @@ namespace OpenRA.Mods.RA
};
if (args.weapon.Report != null && args.weapon.Report.Any())
Sound.Play(args.weapon.Report.Random(attacker.World.SharedRandom) + ".aud", pos);
Sound.Play(args.weapon.Report.Random(attacker.World.SharedRandom), pos);
DoImpacts(args);
}