diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:57 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:57 +0100 |
| commit | 987fe8afd5245232ef347ad2e1559bf36fd12d44 (patch) | |
| tree | 9152a63c8d98b043839b34ac03c318fd2ba8c188 /src/spells3.cc | |
| parent | c4446a2b2cac8166827d0c505b290487a47aaafd (diff) | |
Reduce ridiculous number of test_monster_name usages
Diffstat (limited to 'src/spells3.cc')
| -rw-r--r-- | src/spells3.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/spells3.cc b/src/spells3.cc index ab06eb6a..83f7d97b 100644 --- a/src/spells3.cc +++ b/src/spells3.cc @@ -207,6 +207,10 @@ static casting_result cplus(casting_result old, bool_ effect) } } +GENERATE_MONSTER_LOOKUP_FN(get_fire_golem, "Fire golem") + +// ------------------------------------------------------------- + casting_result air_noxious_cloud() { int dir, type; @@ -1374,8 +1378,6 @@ bool_ item_tester_hook_fire_golem(object_type *o_ptr) casting_result fire_golem() { - int item, x, y, m_idx; - /* Can we reconnect ? */ if (do_control_reconnect()) { @@ -1384,6 +1386,7 @@ casting_result fire_golem() } item_tester_hook = item_tester_hook_fire_golem; + int item; if (!get_item(&item, "Which light source do you want to use to create the golem?", "You have no light source for the golem", @@ -1395,11 +1398,15 @@ casting_result fire_golem() /* Destroy the source object */ inc_stack_size(item, -1); - /* Summon it */ - m_allow_special[1043 + 1] = TRUE; + /* Find a place for it */ + int x, y; find_position(p_ptr->py, p_ptr->px, &y, &x); - m_idx = place_monster_one(y, x, 1043, 0, FALSE, MSTATUS_FRIEND); - m_allow_special[1043 + 1] = FALSE; + + /* Summon it */ + int r_idx = get_fire_golem(); + m_allow_special[r_idx] = TRUE; + int m_idx = place_monster_one(y, x, r_idx, 0, FALSE, MSTATUS_FRIEND); + m_allow_special[r_idx] = FALSE; /* level it */ if (m_idx != 0) |