Lighting improvements: lightmap is drawn over all structures and blurred, flashlight item, OnContained statuseffects are also applied when the item is contained in a characterinventory

2016-05-07 09:13:23 +03:00
parent ef05650c01
commit d5f6fff2c2
14 changed files with 384 additions and 129 deletions
@@ -673,7 +673,7 @@ namespace Barotrauma
                }
                ic.WasUsed = false;

-                if (Container != null) ic.ApplyStatusEffects(ActionType.OnContained, deltaTime);
+                if (parentInventory!=null) ic.ApplyStatusEffects(ActionType.OnContained, deltaTime);
                
                if (!ic.IsActive) continue;

@@ -795,7 +795,6 @@ namespace Barotrauma
                {
                    if (prefab.ResizeHorizontal || prefab.ResizeVertical)
                    {
-
                        prefab.sprite.DrawTiled(spriteBatch, new Vector2(DrawPosition.X-rect.Width/2, -(DrawPosition.Y+rect.Height/2)), new Vector2(rect.Width, rect.Height), color);
                    }
                    else