#include "core/asking-player.h"
#include "core/disturbance.h"
#include "flavor/flavor-describer.h"
-#include "floor/floor.h"
#include "floor/floor-object.h"
#include "inventory/inventory-object.h"
#include "inventory/inventory-slot-types.h"
#include "inventory/player-inventory.h"
-#include "object/object-mark-types.h"
#include "object/object-info.h"
+#include "object/object-mark-types.h"
+#include "system/floor-type-definition.h"
#include "term/screen-processor.h"
#include "view/display-messages.h"
*/
static void autopick_delayed_alter_aux(player_type *player_ptr, INVENTORY_IDX item)
{
- object_type *o_ptr;
- o_ptr = ref_item(player_ptr, item);
-
- if (o_ptr->k_idx == 0 || !(o_ptr->marked & OM_AUTODESTROY)) return;
-
- GAME_TEXT o_name[MAX_NLEN];
- describe_flavor(player_ptr, o_name, o_ptr, 0);
- if (item >= 0)
- {
- inven_item_increase(player_ptr, item, -(o_ptr->number));
- inven_item_optimize(player_ptr, item);
- }
- else
- {
- delete_object_idx(player_ptr, 0 - item);
- }
-
- msg_format(_("%sを自動破壊します。", "Auto-destroying %s."), o_name);
+ object_type *o_ptr;
+ o_ptr = ref_item(player_ptr, item);
+
+ if (o_ptr->k_idx == 0 || !(o_ptr->marked & OM_AUTODESTROY))
+ return;
+
+ GAME_TEXT o_name[MAX_NLEN];
+ describe_flavor(player_ptr, o_name, o_ptr, 0);
+ if (item >= 0) {
+ inven_item_increase(player_ptr, item, -(o_ptr->number));
+ inven_item_optimize(player_ptr, item);
+ } else {
+ delete_object_idx(player_ptr, 0 - item);
+ }
+
+ msg_format(_("%sを自動破壊します。", "Auto-destroying %s."), o_name);
}
-
/*
* Auto-destroy marked items in inventry and on floor
*/
void autopick_delayed_alter(player_type *owner_ptr)
{
- INVENTORY_IDX item;
-
- /*
- * Scan inventry in reverse order to prevent
- * skipping after inven_item_optimize()
- */
- for (item = INVEN_TOTAL - 1; item >= 0; item--)
- autopick_delayed_alter_aux(owner_ptr, item);
-
- floor_type *floor_ptr = owner_ptr->current_floor_ptr;
- item = floor_ptr->grid_array[owner_ptr->y][owner_ptr->x].o_idx;
- while (item)
- {
- OBJECT_IDX next = floor_ptr->o_list[item].next_o_idx;
- autopick_delayed_alter_aux(owner_ptr, -item);
- item = next;
- }
+ INVENTORY_IDX item;
+
+ /*
+ * Scan inventry in reverse order to prevent
+ * skipping after inven_item_optimize()
+ */
+ for (item = INVEN_TOTAL - 1; item >= 0; item--)
+ autopick_delayed_alter_aux(owner_ptr, item);
+
+ floor_type *floor_ptr = owner_ptr->current_floor_ptr;
+ item = floor_ptr->grid_array[owner_ptr->y][owner_ptr->x].o_idx;
+ while (item) {
+ OBJECT_IDX next = floor_ptr->o_list[item].next_o_idx;
+ autopick_delayed_alter_aux(owner_ptr, -item);
+ item = next;
+ }
}
-
/*
* Auto-inscription and/or destroy
*
*/
void autopick_alter_item(player_type *player_ptr, INVENTORY_IDX item, bool destroy)
{
- object_type *o_ptr;
- o_ptr = ref_item(player_ptr, item);
- int idx = find_autopick_list(player_ptr, o_ptr);
- auto_inscribe_item(player_ptr, o_ptr, idx);
- if (destroy && item <= INVEN_PACK)
- auto_destroy_item(player_ptr, o_ptr, idx);
+ object_type *o_ptr;
+ o_ptr = ref_item(player_ptr, item);
+ int idx = find_autopick_list(player_ptr, o_ptr);
+ auto_inscribe_item(player_ptr, o_ptr, idx);
+ if (destroy && item <= INVEN_PACK)
+ auto_destroy_item(player_ptr, o_ptr, idx);
}
-
/*
* Automatically pickup/destroy items in this grid.
*/
-void autopick_pickup_items(player_type* player_ptr, grid_type *g_ptr)
+void autopick_pickup_items(player_type *player_ptr, grid_type *g_ptr)
{
- OBJECT_IDX this_o_idx, next_o_idx = 0;
- for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
- {
- object_type *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
- next_o_idx = o_ptr->next_o_idx;
- int idx = find_autopick_list(player_ptr, o_ptr);
- auto_inscribe_item(player_ptr, o_ptr, idx);
- bool is_auto_pickup = idx >= 0;
- is_auto_pickup &= (autopick_list[idx].action & (DO_AUTOPICK | DO_QUERY_AUTOPICK)) != 0;
- if (!is_auto_pickup)
- {
- auto_destroy_item(player_ptr, o_ptr, idx);
- continue;
- }
-
- disturb(player_ptr, FALSE, FALSE);
- if (!check_store_item_to_inventory(player_ptr, o_ptr))
- {
- GAME_TEXT o_name[MAX_NLEN];
- describe_flavor(player_ptr, o_name, o_ptr, 0);
- msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name);
- o_ptr->marked |= OM_NOMSG;
- continue;
- }
-
- if (!(autopick_list[idx].action & DO_QUERY_AUTOPICK))
- {
- describe_pickup_item(player_ptr, this_o_idx);
- continue;
- }
-
- char out_val[MAX_NLEN + 20];
- GAME_TEXT o_name[MAX_NLEN];
- if (o_ptr->marked & OM_NO_QUERY)
- {
- continue;
- }
-
- describe_flavor(player_ptr, o_name, o_ptr, 0);
- sprintf(out_val, _("%sを拾いますか? ", "Pick up %s? "), o_name);
- if (!get_check(out_val))
- {
- o_ptr->marked |= OM_NOMSG | OM_NO_QUERY;
- continue;
- }
-
- describe_pickup_item(player_ptr, this_o_idx);
- }
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
+ for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx) {
+ object_type *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
+ next_o_idx = o_ptr->next_o_idx;
+ int idx = find_autopick_list(player_ptr, o_ptr);
+ auto_inscribe_item(player_ptr, o_ptr, idx);
+ if ((idx < 0) || (autopick_list[idx].action & (DO_AUTOPICK | DO_QUERY_AUTOPICK)) == 0) {
+ auto_destroy_item(player_ptr, o_ptr, idx);
+ continue;
+ }
+
+ disturb(player_ptr, FALSE, FALSE);
+ if (!check_store_item_to_inventory(player_ptr, o_ptr)) {
+ GAME_TEXT o_name[MAX_NLEN];
+ describe_flavor(player_ptr, o_name, o_ptr, 0);
+ msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name);
+ o_ptr->marked |= OM_NOMSG;
+ continue;
+ }
+
+ if (!(autopick_list[idx].action & DO_QUERY_AUTOPICK)) {
+ describe_pickup_item(player_ptr, this_o_idx);
+ continue;
+ }
+
+ char out_val[MAX_NLEN + 20];
+ GAME_TEXT o_name[MAX_NLEN];
+ if (o_ptr->marked & OM_NO_QUERY) {
+ continue;
+ }
+
+ describe_flavor(player_ptr, o_name, o_ptr, 0);
+ sprintf(out_val, _("%sを拾いますか? ", "Pick up %s? "), o_name);
+ if (!get_check(out_val)) {
+ o_ptr->marked |= OM_NOMSG | OM_NO_QUERY;
+ continue;
+ }
+
+ describe_pickup_item(player_ptr, this_o_idx);
+ }
}
OSDN Git Service
