(965c31410a) Unstable v0.10.4.0

This commit is contained in:
Juan Pablo Arce
2020-07-21 08:57:50 -03:00
parent 4f8bd39789
commit 33d3a41104
546 changed files with 45952 additions and 25762 deletions
@@ -20,13 +20,13 @@ namespace Barotrauma
private set;
}
public SpriteSheet(XElement element, string path = "", string file = "", int emptyFrameCount = 0)
public SpriteSheet(XElement element, string path = "", string file = "")
: base(element, path, file)
{
int columnCount = Math.Max(element.GetAttributeInt("columns", 1), 1);
int rowCount = Math.Max(element.GetAttributeInt("rows", 1), 1);
origin = element.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
emptyFrames = emptyFrameCount;
emptyFrames = element.GetAttributeInt("emptyframes", 0);
Init(columnCount, rowCount);
}