[Refactor] #40560 Made destroy_type to divide do_cmd_destroy()

diff --git a/src/cmd-item/cmd-destroy.c b/src/cmd-item/cmd-destroy.c
index ea60bbf..f582b15 100644 (file)
--- a/src/cmd-item/cmd-destroy.c
+++ b/src/cmd-item/cmd-destroy.c
@@ -32,6 +32,25 @@
 #include "util/int-char-converter.h"
 #include "view/display-messages.h"
 
+typedef struct destroy_type {
+    OBJECT_IDX item;
+    QUANTITY amt;
+    QUANTITY old_number;
+    bool force;
+    object_type *o_ptr;
+    object_type *q_ptr;
+    GAME_TEXT o_name[MAX_NLEN];
+    char out_val[MAX_NLEN + 40];
+} destroy_type;
+
+destroy_type *initialize_destroy_type(destroy_type *destroy_ptr, object_type *o_ptr)
+{
+    destroy_ptr->amt = 1;
+    destroy_ptr->force = FALSE;
+    destroy_ptr->q_ptr = o_ptr;
+    return destroy_ptr;
+}
+
 /*!
  * @brief \83A\83C\83e\83\80\82ð\94j\89ó\82·\82é\83R\83}\83\93\83h\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93 / Destroy an item
  * @param creature_ptr \83v\83\8c\81[\83\84\81[\82Ö\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
@@ -39,36 +58,30 @@
  */
 void do_cmd_destroy(player_type *creature_ptr)
 {
-    OBJECT_IDX item;
-    QUANTITY amt = 1;
-    QUANTITY old_number;
-    bool force = FALSE;
-    object_type *o_ptr;
-    object_type forge;
-    object_type *q_ptr = &forge;
-    GAME_TEXT o_name[MAX_NLEN];
-    char out_val[MAX_NLEN + 40];
     if (creature_ptr->special_defense & KATA_MUSOU)
         set_action(creature_ptr, ACTION_NONE);
 
+    object_type forge;
+    destroy_type tmp_destroy;
+    destroy_type *destroy_ptr = initialize_destroy_type(&tmp_destroy, &forge);
     if (command_arg > 0)
-        force = TRUE;
+        destroy_ptr->force = TRUE;
 
     concptr q = _("\82Ç\82Ì\83A\83C\83e\83\80\82ð\89ó\82µ\82Ü\82·\82©? ", "Destroy which item? ");
     concptr s = _("\89ó\82¹\82é\83A\83C\83e\83\80\82ð\8e\9d\82Á\82Ä\82¢\82È\82¢\81B", "You have nothing to destroy.");
-    o_ptr = choose_object(creature_ptr, &item, q, s, USE_INVEN | USE_FLOOR, 0);
-    if (!o_ptr)
+    destroy_ptr->o_ptr = choose_object(creature_ptr, &destroy_ptr->item, q, s, USE_INVEN | USE_FLOOR, 0);
+    if (destroy_ptr->o_ptr == NULL)
         return;
 
-    if (!force && (confirm_destroy || (object_value(creature_ptr, o_ptr) > 0))) {
-        describe_flavor(creature_ptr, o_name, o_ptr, OD_OMIT_PREFIX);
-        sprintf(out_val, _("\96{\93\96\82É%s\82ð\89ó\82µ\82Ü\82·\82©? [y/n/Auto]", "Really destroy %s? [y/n/Auto]"), o_name);
+    if (!destroy_ptr->force && (confirm_destroy || (object_value(creature_ptr, destroy_ptr->o_ptr) > 0))) {
+        describe_flavor(creature_ptr, destroy_ptr->o_name, destroy_ptr->o_ptr, OD_OMIT_PREFIX);
+        sprintf(destroy_ptr->out_val, _("\96{\93\96\82É%s\82ð\89ó\82µ\82Ü\82·\82©? [y/n/Auto]", "Really destroy %s? [y/n/Auto]"), destroy_ptr->o_name);
         msg_print(NULL);
-        message_add(out_val);
+        message_add(destroy_ptr->out_val);
         creature_ptr->window |= PW_MESSAGE;
         handle_stuff(creature_ptr);
         while (TRUE) {
-            prt(out_val, 0, 0);
+            prt(destroy_ptr->out_val, 0, 0);
             char i = inkey();
             prt("", 0, 0);
             if (i == 'y' || i == 'Y')
@@ -78,47 +91,47 @@ void do_cmd_destroy(player_type *creature_ptr)
                 return;
 
             if (i == 'A') {
-                if (autopick_autoregister(creature_ptr, o_ptr))
-                    autopick_alter_item(creature_ptr, item, TRUE);
+                if (autopick_autoregister(creature_ptr, destroy_ptr->o_ptr))
+                    autopick_alter_item(creature_ptr, destroy_ptr->item, TRUE);
 
                 return;
             }
         }
     }
 
-    if (o_ptr->number > 1) {
-        amt = get_quantity(NULL, o_ptr->number);
-        if (amt <= 0)
+    if (destroy_ptr->o_ptr->number > 1) {
+        destroy_ptr->amt = get_quantity(NULL, destroy_ptr->o_ptr->number);
+        if (destroy_ptr->amt <= 0)
             return;
     }
 
-    old_number = o_ptr->number;
-    o_ptr->number = amt;
-    describe_flavor(creature_ptr, o_name, o_ptr, 0);
-    o_ptr->number = old_number;
+    destroy_ptr->old_number = destroy_ptr->o_ptr->number;
+    destroy_ptr->o_ptr->number = destroy_ptr->amt;
+    describe_flavor(creature_ptr, destroy_ptr->o_name, destroy_ptr->o_ptr, 0);
+    destroy_ptr->o_ptr->number = destroy_ptr->old_number;
     take_turn(creature_ptr, 100);
-    if (!can_player_destroy_object(creature_ptr, o_ptr)) {
+    if (!can_player_destroy_object(creature_ptr, destroy_ptr->o_ptr)) {
         free_turn(creature_ptr);
-        msg_format(_("%s\82Í\94j\89ó\95s\89Â\94\\82¾\81B", "You cannot destroy %s."), o_name);
+        msg_format(_("%s\82Í\94j\89ó\95s\89Â\94\\82¾\81B", "You cannot destroy %s."), destroy_ptr->o_name);
         return;
     }
 
-    object_copy(q_ptr, o_ptr);
-    msg_format(_("%s\82ð\89ó\82µ\82½\81B", "You destroy %s."), o_name);
+    object_copy(destroy_ptr->q_ptr, destroy_ptr->o_ptr);
+    msg_format(_("%s\82ð\89ó\82µ\82½\81B", "You destroy %s."), destroy_ptr->o_name);
     sound(SOUND_DESTITEM);
-    reduce_charges(o_ptr, amt);
-    vary_item(creature_ptr, item, -amt);
-    if (item_tester_high_level_book(q_ptr)) {
+    reduce_charges(destroy_ptr->o_ptr, destroy_ptr->amt);
+    vary_item(creature_ptr, destroy_ptr->item, -destroy_ptr->amt);
+    if (item_tester_high_level_book(destroy_ptr->q_ptr)) {
         bool gain_expr = FALSE;
         if (creature_ptr->prace == RACE_ANDROID) {
         } else if ((creature_ptr->pclass == CLASS_WARRIOR) || (creature_ptr->pclass == CLASS_BERSERKER)) {
             gain_expr = TRUE;
         } else if (creature_ptr->pclass == CLASS_PALADIN) {
             if (is_good_realm(creature_ptr->realm1)) {
-                if (!is_good_realm(tval2realm(q_ptr->tval)))
+                if (!is_good_realm(tval2realm(destroy_ptr->q_ptr->tval)))
                     gain_expr = TRUE;
             } else {
-                if (is_good_realm(tval2realm(q_ptr->tval)))
+                if (is_good_realm(tval2realm(destroy_ptr->q_ptr->tval)))
                     gain_expr = TRUE;
             }
         }
@@ -128,36 +141,36 @@ void do_cmd_destroy(player_type *creature_ptr)
             if (tester_exp > 10000)
                 tester_exp = 10000;
 
-            if (q_ptr->sval < 3)
+            if (destroy_ptr->q_ptr->sval < 3)
                 tester_exp /= 4;
 
             if (tester_exp < 1)
                 tester_exp = 1;
 
             msg_print(_("\8dX\82É\8co\8c±\82ð\90Ï\82ñ\82¾\82æ\82¤\82È\8bC\82ª\82·\82é\81B", "You feel more experienced."));
-            gain_exp(creature_ptr, tester_exp * amt);
+            gain_exp(creature_ptr, tester_exp * destroy_ptr->amt);
         }
 
-        if (item_tester_high_level_book(q_ptr) && q_ptr->tval == TV_LIFE_BOOK) {
+        if (item_tester_high_level_book(destroy_ptr->q_ptr) && destroy_ptr->q_ptr->tval == TV_LIFE_BOOK) {
             chg_virtue(creature_ptr, V_UNLIFE, 1);
             chg_virtue(creature_ptr, V_VITALITY, -1);
-        } else if (item_tester_high_level_book(q_ptr) && q_ptr->tval == TV_DEATH_BOOK) {
+        } else if (item_tester_high_level_book(destroy_ptr->q_ptr) && destroy_ptr->q_ptr->tval == TV_DEATH_BOOK) {
             chg_virtue(creature_ptr, V_UNLIFE, -1);
             chg_virtue(creature_ptr, V_VITALITY, 1);
         }
 
-        if (q_ptr->to_a || q_ptr->to_h || q_ptr->to_d)
+        if ((destroy_ptr->q_ptr->to_a != 0) || (destroy_ptr->q_ptr->to_h != 0) || (destroy_ptr->q_ptr->to_d != 0))
             chg_virtue(creature_ptr, V_ENCHANT, -1);
 
-        if (object_value_real(creature_ptr, q_ptr) > 30000)
+        if (object_value_real(creature_ptr, destroy_ptr->q_ptr) > 30000)
             chg_virtue(creature_ptr, V_SACRIFICE, 2);
-        else if (object_value_real(creature_ptr, q_ptr) > 10000)
+        else if (object_value_real(creature_ptr, destroy_ptr->q_ptr) > 10000)
             chg_virtue(creature_ptr, V_SACRIFICE, 1);
     }
 
-    if (q_ptr->to_a != 0 || q_ptr->to_d != 0 || q_ptr->to_h != 0)
+    if ((destroy_ptr->q_ptr->to_a != 0) || (destroy_ptr->q_ptr->to_d != 0) || (destroy_ptr->q_ptr->to_h != 0))
         chg_virtue(creature_ptr, V_HARMONY, 1);
 
-    if (item >= INVEN_RARM)
+    if (destroy_ptr->item >= INVEN_RARM)
         calc_android_exp(creature_ptr);
 }