From caa23251d8b279529330641032c62f8640ee13ff Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 23 Feb 2015 09:11:58 +0100
Subject: Remove rp_head, rp_name, rp_text, rmp_head, rmp_name, rmp_text

---
 src/squelch/condition.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/squelch/condition.cc')

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)
-- 
cgit v1.2.3