diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-03-04 17:47:43 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-03-29 20:41:39 +0200 |
| commit | 4d6770696a172bae4ef18a00cb1e59f06e641faf (patch) | |
| tree | 6b6475485d731f4ad2a54c84dacfaafec347f8a9 /src/powers.c | |
| parent | 120fed37d8974553e25e5c83ba74c1bb08d71404 (diff) | |
Refactor: Remove duplicate code for accessing inventory/floor object
Diffstat (limited to 'src/powers.c')
| -rw-r--r-- | src/powers.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/powers.c b/src/powers.c index 26e5f6e3..b38b671f 100644 --- a/src/powers.c +++ b/src/powers.c @@ -296,8 +296,7 @@ static void power_activate(int power) { ok = 0; - if (item >= 0) o2_ptr = &p_ptr->inventory[item]; - else o2_ptr = &o_list[0 - item]; + o2_ptr = get_object(item); /* Is the item cursed? */ if ((item >= INVEN_WIELD) && cursed_p(o2_ptr)) @@ -1064,14 +1063,7 @@ static void power_activate(int power) s = "You have nothing to drain."; if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) break; - if (item >= 0) - { - o_ptr = &p_ptr->inventory[item]; - } - else - { - o_ptr = &o_list[0 - item]; - } + o_ptr = get_object(item); lev = k_info[o_ptr->k_idx].level; |