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

Unstable 1.8.4.0

Browse Source
This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Sprite/ConditionalSprite.cs
+1 -8
View File
@@ -39,14 +39,7 @@ namespace Barotrauma
public void CheckConditionals()
{
if (Target == null)
{
IsActive = false;
}
else
{
IsActive = LogicalOperator == PropertyConditional.LogicalOperatorType.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
}
IsActive = Target != null && PropertyConditional.CheckConditionals(Target, conditionals, LogicalOperator);
}
}
}
Barotrauma/BarotraumaShared/SharedSource/Sprite/Sprite.cs
-4
View File
@@ -145,7 +145,6 @@ namespace Barotrauma
RelativeOrigin = SourceElement.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
Depth = SourceElement.GetAttributeFloat("depth", 0.001f);
#if CLIENT
Identifier = GetIdentifier(SourceElement);
AddToList(this);
#endif
}
@@ -282,9 +281,6 @@ namespace Barotrauma
size.Y *= sourceRect.Height;
RelativeOrigin = SourceElement.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
Depth = SourceElement.GetAttributeFloat("depth", 0.001f);
#if CLIENT
Identifier = GetIdentifier(SourceElement);
#endif
}
}