Correctly merge icon and light beam appearances

[poefilter.git] / source / category.cpp

diff --git a/source/category.cpp b/source/category.cpp
index 5e454bb9dc7af7dcef5843efa9b4a3b96761404c..e697aeefac209d456bb2ac30d6f8bb1474d75e55 100644 (file)
--- a/source/category.cpp
+++ b/source/category.cpp
@@ -49,8 +49,12 @@ void Category::create_statements(list<FilterStatement> &st) const
        if(condition)
        {
                Condition *flat = condition->flatten();
-               flat->add_lines(st);
-               delete flat;
+               if(flat)
+               {
+                       flat->add_lines(st);
+                       delete flat;
+               }
+               // TODO handle the case of the entire condition being non-viable
        }
 }
 
@@ -70,6 +74,7 @@ Category::Loader::Loader(Category &c, const PoeFilter &p, CompoundCondition *n):
        add_range<ItemLevelCondition>("item_level");
        add("linked_colors", &Loader::linked_colors);
        add_range<LinkedSocketsCondition>("linked_sockets");
+       add_range<MapTierCondition>("map_tier");
        add_range<SocketsCondition>("sockets");
        add("or", &Loader::or_);
        add_range<QualityCondition>("quality");