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

2019-05-18 17:35:10 +03:00
parent 65a914e5ed
commit f1d794cb39
21 changed files with 241 additions and 162 deletions
@@ -332,7 +332,6 @@ namespace Barotrauma
                        CharacterInventory.Layout.Right;
                }
            }
-        }

            if (!character.IsUnconscious && character.Stun <= 0.0f)
            {
@@ -371,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; }