(025652eb8) Fixed: Holding an item preventing interaction with tutorial elements, medical overlay appearing on top of video / info, reactor command tutorial not completing when powered up by the player

2019-03-27 20:53:30 +02:00
parent ec481eba45
commit 8808edcd21
9 changed files with 209 additions and 21 deletions
@@ -663,20 +663,6 @@ namespace Barotrauma
                msg.Timer -= deltaTime;                
                msg.Pos += msg.Velocity * deltaTime;                
            }
-            
-            foreach (GUIMessage msg in messages)
-            {
-                if (!msg.WorldSpace) continue;
-                msg.Timer -= deltaTime;                
-                msg.Pos += msg.Velocity * deltaTime;                
-            }
-            
-            foreach (GUIMessage msg in messages)
-            {
-                if (!msg.WorldSpace) continue;
-                msg.Timer -= deltaTime;                
-                msg.Pos += msg.Velocity * deltaTime;                
-            }
        }

            messages.RemoveAll(m => m.Timer <= 0.0f);
@@ -124,10 +124,10 @@ namespace Barotrauma
            currentVideo = CreateVideo();
        }

-        public void AddToGUIUpdateList()
+        public void AddToGUIUpdateList(bool ignoreChildren = false, int order = 0)
        {
            if (!IsPlaying()) return;
-            background.AddToGUIUpdateList();
+            background.AddToGUIUpdateList(ignoreChildren, order);
        }

        public void LoadContentWithObjective(string contentPath, VideoSettings videoSettings, TextSettings textSettings, string contentId, bool startPlayback, string objective, Action callback = null)