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

More HashSet trait fields & Lint support

Browse Source
This commit is contained in:
atlimit8
2015-09-05 15:54:00 -05:00
parent e74c0d6c13
commit 8250f223c4
57 changed files with 115 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Scripting/LuaScript.cs
View File

@@ -9,6 +9,8 @@
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
@@ -19,7 +21,7 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Part of the new Lua API.")]
public class LuaScriptInfo : ITraitInfo, Requires<SpawnMapActorsInfo>
{
public readonly string[] Scripts = { };
public readonly HashSet<string> Scripts = new HashSet<string>();
public object Create(ActorInitializer init) { return new LuaScript(this); }
}
@@ -36,7 +38,7 @@ namespace OpenRA.Mods.Common.Scripting
public void WorldLoaded(World world, WorldRenderer worldRenderer)
{
var scripts = info.Scripts ?? new string[0];
var scripts = info.Scripts ?? Enumerable.Empty<string>();
context = new ScriptContext(world, worldRenderer, scripts);
context.WorldLoaded();
}

3
OpenRA.Mods.Common/Scripting/ScriptUpgradesCache.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Scripting
@@ -17,7 +18,7 @@ namespace OpenRA.Mods.Common.Scripting
{
[UpgradeGrantedReference]
[Desc("Upgrades that can be granted from the scripts.")]
public readonly string[] Upgrades = { };
public readonly HashSet<string> Upgrades = new HashSet<string>();
public object Create(ActorInitializer init) { return new ScriptUpgradesCache(this); }
}