summaryrefslogtreecommitdiff
path: root/src/squelch/condition.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
commitcaa23251d8b279529330641032c62f8640ee13ff (patch)
treefd442587708295bfc31b17f12cc726aedf406f15 /src/squelch/condition.cc
parent3bfa6a0e2cba6b4fc8f53dac1e987c95fe7ed93c (diff)
Remove rp_head, rp_name, rp_text, rmp_head, rmp_name, rmp_text
Diffstat (limited to 'src/squelch/condition.cc')
-rw-r--r--src/squelch/condition.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc
index 1df22328..e187157b 100644
--- a/src/squelch/condition.cc
+++ b/src/squelch/condition.cc
@@ -511,8 +511,7 @@ void StatusCondition::to_json(json_t *j) const
bool RaceCondition::is_match(object_type *o_ptr) const
{
- return boost::algorithm::iequals(m_race,
- rp_ptr->title + rp_name);
+ return boost::algorithm::iequals(m_race, rp_ptr->title);
}
std::shared_ptr<Condition> RaceCondition::from_json(json_t *j)
@@ -546,8 +545,7 @@ void RaceCondition::to_json(json_t *j) const
bool SubraceCondition::is_match(object_type *o_ptr) const
{
- return boost::algorithm::iequals(m_subrace,
- rmp_ptr->title + rmp_name);
+ return boost::algorithm::iequals(m_subrace, rmp_ptr->title);
}
std::shared_ptr<Condition> SubraceCondition::from_json(json_t *j)