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/melee2.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/melee2.cc')
| -rw-r--r-- | src/melee2.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/melee2.cc b/src/melee2.cc index 638b7151..58aa68cb 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -24,6 +24,7 @@ #include "monster3.hpp" #include "object1.hpp" #include "object2.hpp" +#include "options.hpp" #include "quark.h" #include "skills.hpp" #include "spells1.hpp" @@ -7083,8 +7084,7 @@ static void process_monster(int m_idx, bool_ is_frien) msg_format("%^s picks up %s.", m_name, o_name); } - /* Option */ - if (testing_carry) + /* Put into inventory of monster */ { /* Excise the object */ excise_object_idx(this_o_idx); @@ -7104,13 +7104,6 @@ static void process_monster(int m_idx, bool_ is_frien) /* Carry object */ m_ptr->hold_o_idx = this_o_idx; } - - /* Nope */ - else - { - /* Delete the object */ - delete_object_idx(this_o_idx); - } } /* Destroy the item */ |