From 72ceb4f2aba3b86be43ba9a7cb5c576b79920543 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 7 Mar 2015 16:55:41 +0100
Subject: Split option variables into separate header and source file

Remove unused

  testing_stack
  testing_carry

options while we're at it.
---
 src/melee2.cc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/melee2.cc')

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 */
-- 
cgit v1.2.3