diff --git a/src/ItemParameterTable.cc b/src/ItemParameterTable.cc index 72d26ab7..84bae4e5 100644 --- a/src/ItemParameterTable.cc +++ b/src/ItemParameterTable.cc @@ -1134,7 +1134,7 @@ public: return std::make_pair(event_table.data(), event_table.size()); } - virtual const std::unordered_set& all_unsealable_items() const { + virtual const std::set& all_unsealable_items() const { return this->unsealable_items; } @@ -1178,7 +1178,7 @@ protected: std::vector sound_remaps; std::vector tech_boosts; std::vector> unwrap_table; - std::unordered_set unsealable_items; + std::set unsealable_items; std::vector ranged_specials; }; @@ -2872,7 +2872,7 @@ public: } } - virtual const std::unordered_set& all_unsealable_items() const { + virtual const std::set& all_unsealable_items() const { if constexpr (requires { this->root->unsealable_table; }) { if (!this->unsealable_table.has_value()) { auto& ret = this->unsealable_table.emplace(); @@ -2884,7 +2884,7 @@ public: } return *this->unsealable_table; } else { - static const std::unordered_set empty_set{}; + static const std::set empty_set{}; return empty_set; } } @@ -3215,7 +3215,7 @@ protected: // the matching order matters. mutable std::optional>> item_combination_index; - mutable std::optional> unsealable_table; + mutable std::optional> unsealable_table; }; using ItemParameterTableDCNTE = BinaryItemParameterTableT< diff --git a/src/ItemParameterTable.hh b/src/ItemParameterTable.hh index 854b83f5..1917a8e6 100644 --- a/src/ItemParameterTable.hh +++ b/src/ItemParameterTable.hh @@ -472,7 +472,7 @@ public: virtual std::pair get_event_items(uint8_t event_number) const = 0; // unsealable_table accessors - virtual const std::unordered_set& all_unsealable_items() const = 0; + virtual const std::set& all_unsealable_items() const = 0; bool is_unsealable_item(uint8_t data1_0, uint8_t data1_1, uint8_t data1_2) const; bool is_unsealable_item(const ItemData& item) const;