From 58e8024f17446bf3b1a36985d746f6de330874c0 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 23 Feb 2015 09:11:58 +0100 Subject: Remove s_head, s_name, s_text --- src/squelch/condition.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/squelch') diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc index e187157b..e608300d 100644 --- a/src/squelch/condition.cc +++ b/src/squelch/condition.cc @@ -758,10 +758,8 @@ std::shared_ptr SkillCondition::from_json(json_t *j) void SkillCondition::write_tree(TreePrinter *p, Cursor *, uint8_t ecol, uint8_t bcol) const { - cptr skill_name = s_info[m_skill_idx].name + s_name; - p->write(ecol, "Your skill in "); - p->write(bcol, skill_name); + p->write(bcol, s_info[m_skill_idx].name); p->write(ecol, " is from "); p->write(TERM_WHITE, format("%d", (int) m_min)); p->write(ecol, " to "); @@ -772,7 +770,7 @@ void SkillCondition::write_tree(TreePrinter *p, Cursor *, uint8_t ecol, uint8_t void SkillCondition::to_json(json_t *j) const { json_object_set_new(j, "name", - json_string(s_info[m_skill_idx].name + s_name)); + json_string(s_info[m_skill_idx].name)); json_object_set_new(j, "min", json_integer(m_min)); json_object_set_new(j, "max", -- cgit v1.2.3