Merge branch 'master' into animcontroller-overhaul

This commit is contained in:
Regalis
2016-10-19 21:15:44 +03:00
9 changed files with 116 additions and 29 deletions
+3 -4
View File
@@ -872,13 +872,12 @@ namespace Barotrauma
prefab.sprite.effects = oldEffects;
for (int i = 0; i < drawableComponents.Count; i++ )
List<IDrawableComponent> staticDrawableComponents = new List<IDrawableComponent>(drawableComponents); //static list to compensate for drawable toggling
for (int i = 0; i < staticDrawableComponents.Count; i++)
{
drawableComponents[i].Draw(spriteBatch, editing);
staticDrawableComponents[i].Draw(spriteBatch, editing);
}
//foreach (ItemComponent component in components) component.Draw(spriteBatch, editing);
if (GameMain.DebugDraw && aiTarget!=null) aiTarget.Draw(spriteBatch);
if (!editing || (body != null && !body.Enabled))