diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
| commit | 58e8024f17446bf3b1a36985d746f6de330874c0 (patch) | |
| tree | 59ee37337149de5009a9e036e86bdeeb1e8d4663 /src/squelch | |
| parent | e3405ca03eebafa60e773812c4f12fed7f4805db (diff) | |
Remove s_head, s_name, s_text
Diffstat (limited to 'src/squelch')
| -rw-r--r-- | src/squelch/condition.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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<Condition> 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", |