diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-03-10 18:41:54 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-03-10 19:02:23 +0100 |
| commit | 8915788267bb1036c110195eb0a8826b6592cbd5 (patch) | |
| tree | d60518d32b6d8f8090fa80670c78ffa074d4b58e /src/cmd7.cc | |
| parent | 7af6bc9b2ec5326181fee27dad9e465992b2b8a8 (diff) | |
Split use_symbiotic_power() into two separate functions
This split makes it much clearer which functionality is being used at
call sites. We also eliminate a little bit of duplicate code.
Diffstat (limited to 'src/cmd7.cc')
| -rw-r--r-- | src/cmd7.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/cmd7.cc b/src/cmd7.cc index 711bf2ca..a27d7e4b 100644 --- a/src/cmd7.cc +++ b/src/cmd7.cc @@ -1841,7 +1841,7 @@ void do_cmd_possessor() bool use_great = (get_skill_scale(SKILL_POSSESSION, 100) >= r_info[p_ptr->body_monster].level); /* Select power */ - use_symbiotic_power(p_ptr->body_monster, use_great, false); + use_monster_power(p_ptr->body_monster, use_great); if (p_ptr->csp < 0) { @@ -4268,7 +4268,7 @@ void do_cmd_symbiotic(void) break; } - if (0 > use_symbiotic_power(o_ptr->pval, false, true)) + if (0 > use_symbiotic_power(o_ptr->pval, false)) return; break; @@ -4307,7 +4307,7 @@ void do_cmd_symbiotic(void) break; } - if(0 > use_symbiotic_power(o_ptr->pval, true, true)) + if(0 > use_symbiotic_power(o_ptr->pval, true)) return; break; @@ -4325,17 +4325,14 @@ void do_cmd_symbiotic(void) case 8: { int y, x; - cave_type *c_ptr; - monster_type *m_ptr; - if (!tgt_pt(&x, &y)) return; - c_ptr = &cave[y][x]; + cave_type *c_ptr = &cave[y][x]; if (!c_ptr->m_idx) break; - m_ptr = &m_list[c_ptr->m_idx]; - use_symbiotic_power(m_ptr->r_idx, true, true); + monster_type *m_ptr = &m_list[c_ptr->m_idx]; + use_symbiotic_power(m_ptr->r_idx, true); break; } |