From f035201f330a3b1f50a2041ea9ad3f854f7d4e00 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:14 +0200
Subject: Move all options to a struct instead of using globals

---
 src/object1.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/object1.cc')

diff --git a/src/object1.cc b/src/object1.cc
index b0760abe..5f4db047 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -5896,7 +5896,7 @@ void py_pickup_floor(int pickup)
 			bool_ do_pickup = TRUE;
 
 			/* Hack -- query every item */
-			if (carry_query_flag || (!can_carry_heavy(&o_list[floor_o_idx])))
+			if (options->carry_query_flag || !can_carry_heavy(&o_list[floor_o_idx]))
 			{
 				char o_name[80] = "";
 				object_desc(o_name, o_ptr, TRUE, 3);
-- 
cgit v1.2.3