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

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -615,7 +615,7 @@ namespace Barotrauma
                ID = (ushort)int.Parse(element.Attribute("ID").Value)
            };

-            Enum.TryParse(element.GetAttributeString("spawn", "Path"), out w.spawnType);
+            w.spawnType = spawnType;

            string idCardDescString = element.GetAttributeString("idcarddesc", "");
            if (!string.IsNullOrWhiteSpace(idCardDescString))