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

Fix crashes in WeaponInfo when warheads or projectiles cannot be created

Browse Source
This commit is contained in:
abcdefg30
2022-06-22 16:58:08 +02:00
committed by Paul Chote
parent 185bef39b0
commit 82692b9d7f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -139,7 +139,11 @@ namespace OpenRA.GameRules
{ {
if (!yaml.ToDictionary().TryGetValue("Projectile", out var proj)) if (!yaml.ToDictionary().TryGetValue("Projectile", out var proj))
return null; return null;
var ret = Game.CreateObject<IProjectileInfo>(proj.Value + "Info"); var ret = Game.CreateObject<IProjectileInfo>(proj.Value + "Info");
if (ret == null)
return null;
FieldLoader.Load(ret, proj); FieldLoader.Load(ret, proj);
return ret; return ret;
} }
@@ -150,6 +154,9 @@ namespace OpenRA.GameRules
foreach (var node in yaml.Nodes.Where(n => n.Key.StartsWith("Warhead"))) foreach (var node in yaml.Nodes.Where(n => n.Key.StartsWith("Warhead")))
{ {
var ret = Game.CreateObject<IWarhead>(node.Value.Value + "Warhead"); var ret = Game.CreateObject<IWarhead>(node.Value.Value + "Warhead");
if (ret == null)
continue;
FieldLoader.Load(ret, node.Value); FieldLoader.Load(ret, node.Value);
retList.Add(ret); retList.Add(ret);
} }