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

Less aggressive rules caching

Browse Source 
ActorInfo instances depend on the whole set of ActorInfos
This commit is contained in:
Pavlos Touboulidis
2014-05-02 22:05:05 +03:00
parent 693186e1eb
commit c68427eaa6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GameRules/Rules.cs
View File

@@ -94,13 +94,15 @@ namespace OpenRA
string[] files, List<MiniYamlNode> nodes, string[] files, List<MiniYamlNode> nodes,
Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f) Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
{ {
string inputKey = string.Concat(string.Join("|", files), "|", nodes.WriteToString());
var mergedNodes = files var mergedNodes = files
.Select(s => MiniYaml.FromFile(s)) .Select(s => MiniYaml.FromFile(s))
.Aggregate(nodes, MiniYaml.MergeLiberal); .Aggregate(nodes, MiniYaml.MergeLiberal);
Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> wrap = (wkv, wyy) => Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> wrap = (wkv, wyy) =>
{ {
var key = wkv.Value.ToLines(wkv.Key).JoinWith("|"); var key = inputKey + wkv.Value.ToLines(wkv.Key).JoinWith("|");
T t; T t;
if (itemCache.TryGetValue(key, out t)) if (itemCache.TryGetValue(key, out t))
return t; return t;