Fixed merge errors

This commit is contained in:
EvilFactory
2024-04-24 12:34:59 -03:00
parent 0a9ff43986
commit 079b0c3648
3 changed files with 1 additions and 3 deletions
@@ -1120,6 +1120,7 @@ namespace Barotrauma
case "hook":
luaHook ??= new List<(string, ContentXElement)>();
luaHook.Add((subElement.GetAttributeString("name", ""), subElement));
break;
case "triggeranimation":
AnimationType animType = subElement.GetAttributeEnum("type", def: AnimationType.NotDefined);
string fileName = subElement.GetAttributeString("filename", def: null) ?? subElement.GetAttributeString("file", def: null);