(5e16139ed) Added "OrderGiver" field to AI orders, always show reports from the currently controlled character (even if the report is not targeted for the character's class)

2019-05-18 17:26:34 +03:00
parent 4dfd5f6fa2
commit e63ffe652e
8 changed files with 76 additions and 15 deletions
@@ -370,7 +370,13 @@ namespace Barotrauma

        private static void DrawOrderIndicator(SpriteBatch spriteBatch, Camera cam, Character character, Order order, float iconAlpha = 1.0f)
        {
-            if (order.TargetAllCharacters && !order.HasAppropriateJob(character)) { return; }
+            if (order.TargetAllCharacters)
+            {
+                if (order.OrderGiver != character && !order.HasAppropriateJob(character))
+                {
+                    return;
+                }
+            }

            Entity target = order.ConnectedController != null ? order.ConnectedController.Item : order.TargetEntity;
            if (target == null) { return; }