(92a838f87) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-29 21:50:58 +02:00
parent 6f919a4de0
commit 0b098efbf6
7 changed files with 117 additions and 20 deletions
@@ -337,7 +337,24 @@ namespace Barotrauma
            var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.03f), paddedLeftPanel.RectTransform), TextManager.Get("ShowLighting"))
            {
                Selected = lightingEnabled,
-                OnSelected = (GUITickBox obj) => { lightingEnabled = obj.Selected; return true; }
+                OnSelected = (GUITickBox obj) => 
+                {
+                    lightingEnabled = obj.Selected;
+                    if (lightingEnabled)
+                    {
+                        //turn off lights that are inside containers
+                        foreach (Item item in Item.ItemList)
+                        {
+                            foreach (LightComponent lightComponent in item.GetComponents<LightComponent>())
+                            {
+                                lightComponent.Light.Color = item.Container != null || (item.body != null && !item.body.Enabled) ?
+                                    Color.Transparent :
+                                    lightComponent.LightColor;
+                            }
+                        }
+                    }
+                    return true;
+                }
            };
            tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.03f), paddedLeftPanel.RectTransform), TextManager.Get("ShowWalls"))
            {