diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
| commit | d191da218fc81d989d0ebdcfd66a4e0b00405121 (patch) | |
| tree | 709aaa40610fceb98e9a85178d16579a280476f2 /src | |
| parent | 0d6002ae3c1f2b4fc043bf5ff8cad1e918af7c80 (diff) | |
Clean up conditional in monst_spell_monst()
Diffstat (limited to 'src')
| -rw-r--r-- | src/melee2.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/melee2.cc b/src/melee2.cc index 419282c6..59f85803 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -962,7 +962,6 @@ static bool_ monst_spell_monst(int m_idx) static const monster_spell_flag_set SF_INT_MASK = compute_smart_mask(); int y = 0, x = 0; - int i = 1; char m_name[80], t_name[80]; char m_poss[80]; char ddesc[80]; @@ -997,20 +996,14 @@ static bool_ monst_spell_monst(int m_idx) if ((rand_int(100) >= chance) && (monst_spell_monst_spell == -1)) return (FALSE); - /* Target location */ - if (m_ptr->target > -1) + /* Make sure monster actually has a target */ + if (m_ptr->target <= 0) { - if (m_ptr->target > 0) - { - i = m_ptr->target; - } - else return FALSE; + return FALSE; } - else return FALSE; - { - int t_idx = i; + int t_idx = m_ptr->target; monster_type *t_ptr = &m_list[t_idx]; auto const tr_ptr = t_ptr->race(); |