diff options
author | Bardur Arantsson <bardur@scientician.net> | 2015-03-07 16:55:41 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2015-03-07 16:55:41 +0100 |
commit | 72ceb4f2aba3b86be43ba9a7cb5c576b79920543 (patch) | |
tree | e353c73e2f2dd75537370e1130a7303a549d5861 /src/melee1.cc | |
parent | 09f4a4cea91c4cb80f987ad903c3d2748fa73e8c (diff) |
Split option variables into separate header and source file
Remove unused
testing_stack
testing_carry
options while we're at it.
Diffstat (limited to 'src/melee1.cc')
-rw-r--r-- | src/melee1.cc | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/src/melee1.cc b/src/melee1.cc index d56eb263..30f94bb9 100644 --- a/src/melee1.cc +++ b/src/melee1.cc @@ -2108,8 +2108,7 @@ bool_ make_attack_normal(int m_idx, byte divis) ((o_ptr->number > 1) ? "One of y" : "Y"), o_name, index_to_label(i)); - /* Option */ - if (testing_carry) + /* Copy into inventory of monster */ { s16b o_idx; @@ -2153,38 +2152,6 @@ bool_ make_attack_normal(int m_idx, byte divis) m_ptr->hold_o_idx = o_idx; } } - else - { - if (strstr(r_ptr->name, "black market") && randint(2) != 1) - { - s16b o_idx; - - /* Make an object */ - o_idx = o_pop(); - - /* Success */ - if (o_idx) - { - object_type *j_ptr; - if (cheat_xtra || cheat_peek) - msg_print("Moving object to black market..."); - - /* Get new object */ - j_ptr = &o_list[o_idx]; - - /* Copy object */ - object_copy(j_ptr, o_ptr); - - /* Modify number */ - j_ptr->number = 1; - - /* Forget mark */ - j_ptr->marked = FALSE; - - move_to_black_market(j_ptr); - } - } - } /* Steal the items */ inc_stack_size_ex(i, -1, OPTIMIZE, NO_DESCRIBE); |