(e9f10995d) Merge branch 'bugreporterUI' into dev

2019-05-18 17:43:00 +03:00
parent 3a2310e547
commit 78b67de866
52 changed files with 428 additions and 223 deletions
@@ -39,7 +39,9 @@ namespace Barotrauma
        public Entity TargetEntity; 
        public ItemComponent TargetItemComponent;
        public readonly bool UseController;
-        public Controller ConnectedController; 
+        public Controller ConnectedController;
+
+        public Character OrderGiver;
        
        public readonly string[] AppropriateJobs;
        public readonly string[] Options;
@@ -120,7 +122,7 @@ namespace Barotrauma
            }
        }
        
-        public Order(Order prefab, Entity targetEntity, ItemComponent targetItem)
+        public Order(Order prefab, Entity targetEntity, ItemComponent targetItem, Character orderGiver = null)
        {
            Prefab = prefab;

@@ -134,6 +136,7 @@ namespace Barotrauma
            TargetAllCharacters = prefab.TargetAllCharacters;
            AppropriateJobs     = prefab.AppropriateJobs;
            FadeOutTime         = prefab.FadeOutTime;
+            OrderGiver          = orderGiver;

            TargetEntity = targetEntity;
            if (targetItem != null)