Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level

2015-11-19 16:29:13 +02:00
parent 118d60342a
commit f42cc78af3
23 changed files with 42 additions and 65 deletions
@@ -394,7 +394,7 @@ namespace Barotrauma
            {
                for (ushort i = 0; i < Info.PickedItemIDs.Count; i++ )
                {
-                    if (i == 0) continue;
+                    if (Info.PickedItemIDs[i] == 0) continue;

                    Item item = FindEntityByID(Info.PickedItemIDs[i]) as Item;
                    if (item == null) continue;