(133a5b1da) Merge branch 'dev' into human-ai

2019-05-16 05:27:51 +03:00
parent ab49749f8b
commit 3bce90251a
17 changed files with 150 additions and 238 deletions
@@ -817,7 +817,7 @@ namespace Barotrauma
        {
            if (dummyCharacter != null) RemoveDummyCharacter();

-            dummyCharacter = Character.Create(Character.HumanConfigFile, Vector2.Zero, "");
+            dummyCharacter = Character.Create(Character.HumanConfigFile, Vector2.Zero, "", hasAi: false);

            //make space for the entity menu
            for (int i = 0; i < dummyCharacter.Inventory.SlotPositions.Length; i++)