Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method)

This commit is contained in:
Regalis
2016-10-31 20:35:04 +02:00
parent 5cc605bc01
commit eb2c51c2f1
46 changed files with 93 additions and 200 deletions
+6 -6
View File
@@ -576,9 +576,9 @@ namespace Barotrauma
var soundElements = doc.Root.Elements("sound").ToList();
if (soundElements.Any())
{
sounds = new Sound[soundElements.Count()];
soundStates = new AIController.AiState[soundElements.Count()];
soundRange = new float[soundElements.Count()];
sounds = new Sound[soundElements.Count];
soundStates = new AIController.AiState[soundElements.Count];
soundRange = new float[soundElements.Count];
int i = 0;
foreach (XElement soundElement in soundElements)
{
@@ -801,7 +801,7 @@ namespace Barotrauma
{
attackPos = Submarine.LastPickedPosition;
if (body != null && body.UserData is Submarine)
if (body.UserData is Submarine)
{
var sub = ((Submarine)body.UserData);
@@ -1439,10 +1439,10 @@ namespace Barotrauma
if (sounds == null || !sounds.Any()) return;
var matchingSoundStates = soundStates.Where(x => x == state).ToList();
int selectedSound = Rand.Int(matchingSoundStates.Count());
int selectedSound = Rand.Int(matchingSoundStates.Count);
int n = 0;
for (int i = 0; i < sounds.Count(); i++)
for (int i = 0; i < sounds.Length; i++)
{
if (soundStates[i] != state) continue;
if (n == selectedSound && sounds[i]!=null)