- if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
-\r
- /* Get the item (in the pack) */\r
- if (item >= 0)\r
- {\r
- o_ptr = &inventory[item];\r
- }\r
-\r
- /* Get the item (on the floor) */\r
- else\r
- {\r
- o_ptr = &o_list[0 - item];\r
- }\r
+ o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));\r
+ if (!o_ptr) return;\r