zydronium/muddesigner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed some this's (this.) and converted some Foreach statements to LINQ statements.

Browse source
This commit is contained in:
darxval_cp 2012-05-31 18:55:23 -07:00
parent c3c91250e2
commit bec840f5e4
4 changed files with 40 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

31
MudEngine/WinPC_Engine/Scripting/ScriptFactory.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using MudEngine.Core;
@ -27,15 +28,7 @@ namespace MudEngine.Scripting
_AssemblyCollection = new List<Assembly>();
//See if a file exists first with this assembly name.
if (File.Exists(assembly))
{
a = Assembly.Load(new AssemblyName(assembly));
}
//If not, then try and load it differently
else
{
a = Assembly.Load(assembly);
}
a = File.Exists(assembly) ? Assembly.Load(new AssemblyName(assembly)) : Assembly.Load(assembly);
if (a == null)
return;
@ -54,7 +47,7 @@ namespace MudEngine.Scripting
//Add the supplied assembly to our AssemblyCollection
_AssemblyCollection.Add(assembly);
this.Assembly = assembly;
Assembly = assembly;
}
#endif
/// <summary>
@ -142,24 +135,18 @@ namespace MudEngine.Scripting
Type script = typeof(BaseScript);
Boolean foundScript = false;
if (this._AssemblyCollection.Count == 0)
if (_AssemblyCollection.Count == 0)
return null;
try
{
foreach (Assembly a in _AssemblyCollection)
foreach (var a in _AssemblyCollection.Where(a => a != null))
{
if (a == null)
continue;
foreach (Type t in a.GetTypes())
foreach (var t in a.GetTypes().Where(t => t.BaseType.Name == baseScript))
{
if (t.BaseType.Name == baseScript)
{
script = t;
foundScript = true;
break;
}
script = t;
foundScript = true;
break;
}
if (foundScript)