diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
| commit | a53531b93084f531f9bf72b4cd3e3369cb036bca (patch) | |
| tree | 0691c902d62b01e52e5848d8e87a1fe4f63ba314 | |
| parent | ec63a193febcf80f26f1b19a45ae5df70801549e (diff) | |
Remove superfluous match_type::STATE
It was only partially removed when removing identification.
| -rw-r--r-- | src/include/tome/squelch/condition.hpp | 8 | ||||
| -rw-r--r-- | src/squelch/condition.cc | 1 | ||||
| -rw-r--r-- | src/squelch/condition_metadata.cc | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/include/tome/squelch/condition.hpp b/src/include/tome/squelch/condition.hpp index 86396530..fcb0bdb4 100644 --- a/src/include/tome/squelch/condition.hpp +++ b/src/include/tome/squelch/condition.hpp @@ -20,10 +20,10 @@ namespace squelch { * Types of matches used for conditions. */ enum class match_type { - AND , OR , NOT , NAME , CONTAIN , - INSCRIBED, DISCOUNT, SYMBOL , STATE , STATUS , - TVAL , SVAL , RACE , SUBRACE , CLASS , - LEVEL , SKILL , ABILITY, INVENTORY, EQUIPMENT }; + AND , OR , NOT , NAME , CONTAIN, + INSCRIBED, DISCOUNT, SYMBOL , STATUS , TVAL , + SVAL , RACE , SUBRACE , CLASS , LEVEL , + SKILL , ABILITY , INVENTORY, EQUIPMENT }; /** * Bidirectional map between enumeration values and strings. diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc index 43802c41..8768774d 100644 --- a/src/squelch/condition.cc +++ b/src/squelch/condition.cc @@ -34,7 +34,6 @@ EnumStringMap<match_type> &match_mapping() { match_type::INSCRIBED, "inscribed" }, { match_type::DISCOUNT, "discount" }, { match_type::SYMBOL, "symbol" }, - { match_type::STATE, "state" }, { match_type::STATUS, "status" }, { match_type::TVAL, "tval" }, { match_type::SVAL, "sval" }, diff --git a/src/squelch/condition_metadata.cc b/src/squelch/condition_metadata.cc index 2ede08f2..3a3f49d0 100644 --- a/src/squelch/condition_metadata.cc +++ b/src/squelch/condition_metadata.cc @@ -301,10 +301,6 @@ static void display_desc(match_type match_type_) line("Check is true if object symbol is ok"); break; - case match_type::STATE: - line("Check is true if object is identified/unidentified"); - break; - case match_type::STATUS: line("Check is true if object status is ok"); break; @@ -364,7 +360,6 @@ std::shared_ptr<Condition> new_condition_interactive() match_type::INSCRIBED, match_type::DISCOUNT, match_type::SYMBOL, - match_type::STATE, match_type::STATUS, match_type::TVAL, match_type::SVAL, |