Endworm attacks working, itemlabel text saving bugfix, deconstructors & fabricators need power, engine sprite, disable wire node dragging in character mode, only hit with one meleeweapon at a time, fixrequirement text overflow fix, mapentities can hace multiple categories, Gap.FindHull fix, Waypoint ladder & gap saving, stuff

2016-01-18 20:09:38 +02:00
parent 5f1cb194ab
commit 1a5b3fa66a
39 changed files with 206 additions and 152 deletions
@@ -146,7 +146,7 @@ namespace Barotrauma
            int x = selectedItemList.Rect.Width + 40;
            foreach (MapEntityCategory category in Enum.GetValues(typeof(MapEntityCategory)))
            {
-                var items = MapEntityPrefab.list.FindAll(ep => ep.Price>0.0f && ep.Category == category);
+                var items = MapEntityPrefab.list.FindAll(ep => ep.Price>0.0f && ep.Category.HasFlag(category));
                if (!items.Any()) continue;

                var categoryButton = new GUIButton(new Rectangle(x, 0, 100, 20), category.ToString(), GUI.Style, bottomPanel[(int)PanelTab.Store]);
@@ -443,7 +443,7 @@ namespace Barotrauma
            storeItemList.ClearChildren();

            MapEntityCategory category = (MapEntityCategory)selection;
-            var items = MapEntityPrefab.list.FindAll(ep => ep.Price > 0.0f && ep.Category == category);
+            var items = MapEntityPrefab.list.FindAll(ep => ep.Price > 0.0f && ep.Category.HasFlag(category));

            int width = storeItemList.Rect.Width;