diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:45:08 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:49:38 +0200 |
commit | 1bbed63b66c0f69809e698576a51501150f06bba (patch) | |
tree | f458361c0c2e7dac2502b1aace63d83d5dbd15b4 /src/squelch | |
parent | b9fca0267b1d6a32d57e1fb4387f52c19d1c3fa6 (diff) |
Move k_info into GameEditData
Diffstat (limited to 'src/squelch')
-rw-r--r-- | src/squelch/condition.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc index 8715b364..cd7f879c 100644 --- a/src/squelch/condition.cc +++ b/src/squelch/condition.cc @@ -878,8 +878,9 @@ void StateCondition::to_json(jsoncons::json &j) const bool SymbolCondition::is_match(object_type *o_ptr) const { - object_kind *k_ptr = &k_info[o_ptr->k_idx]; - return k_ptr->d_char == m_symbol; + auto const &k_info = game->edit_data.k_info; + + return k_info[o_ptr->k_idx].d_char == m_symbol; } std::shared_ptr<Condition> SymbolCondition::from_json(jsoncons::json const &j) |