vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs
+4 -5
View File
@@ -28,12 +28,11 @@ namespace Barotrauma
public readonly string[] AllowedContainerIdentifiers;
public readonly string[] AllowedContainerTags;
public ContainedItemSprite(XElement element, string path = "")
public ContainedItemSprite(XElement element, string path = "", bool lazyLoad = false)
{
Sprite = new Sprite(element, path);
Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
AllowedContainerIdentifiers = element.GetAttributeStringArray("allowedcontaineridentifiers", new string[0], convertToLowerInvariant: true);
AllowedContainerTags = element.GetAttributeStringArray("allowedcontainertags", new string[0], convertToLowerInvariant: true);
}
public bool MatchesContainer(Item container)
@@ -101,9 +100,9 @@ namespace Barotrauma
/// </summary>
public List<PropertyConditional> AnimationConditionals { get; private set; } = new List<PropertyConditional>();
public DecorativeSprite(XElement element, string path = "")
public DecorativeSprite(XElement element, string path = "", bool lazyLoad = false)
{
Sprite = new Sprite(element, path);
Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
SerializableProperty.DeserializeProperties(this, element);
foreach (XElement subElement in element.Elements())