(42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool.

2019-05-16 05:58:15 +03:00
parent 18b6775457
commit 257889b9cc
39 changed files with 505 additions and 639 deletions
@@ -166,7 +166,7 @@ namespace Barotrauma
                Vector2.Zero, Vector2.Zero, Vector2.Zero, Vector2.Zero
            };

-            Sprite sprite = newObject.Sprite ?? newObject.Prefab.DeformableSprite?.Sprite;
+            Sprite sprite = newObject.Prefab.Sprite ?? newObject.Prefab.DeformableSprite?.Sprite;

            //calculate the positions of the corners of the rotated sprite
            if (sprite != null)