(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.

2019-04-04 11:08:18 +03:00
parent 7491b06a5d
commit d4752bb6a0
56 changed files with 854 additions and 572 deletions
@@ -79,8 +79,7 @@ namespace Barotrauma.Items.Components
                        break;
                }
            }
-            item.IsShootable = true;
-            item.RequireAimToUse = true;
+
            InitProjSpecific(element);
        }

@@ -312,10 +311,7 @@ namespace Barotrauma.Items.Components

            sinTime += deltaTime;
            character.CursorPosition = leak.Position + VectorExtensions.Forward(Item.body.TransformedRotation + (float)Math.Sin(sinTime), dist);
-            if (item.RequireAimToUse)
-            {
-                character.SetInput(InputType.Aim, false, true);
-            }
+            character.SetInput(InputType.Aim, false, true);

            // Press the trigger only when the tool is approximately facing the target.
            // If the character is climbing, ignore the check, because we cannot aim while climbing.