[Refactor] #37353 コメント整理。 / Refactor comments.

[hengband/hengband.git] / src / dungeon.c

diff --git a/src/dungeon.c b/src/dungeon.c
index 9c3712c..b70e1a9 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -26,10 +26,14 @@
 #include "object-curse.h"
 #include "store.h"
 #include "spells-summon.h"
+#include "spells-object.h"
 #include "monsterrace-hook.h"
 #include "world.h"
 #include "mutation.h"
 #include "quest.h"
+#include "artifact.h"
+#include "avatar.h"
+#include "player-status.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
@@ -151,8 +155,6 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
 
        /* Auto-inscription/destroy */
        autopick_alter_item(slot, destroy_feeling);
-
-       /* Combine / Reorder the pack (later) */
        p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP);
@@ -2593,18 +2595,18 @@ static void process_world_aux_mutation(void)
                take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->wt / 6), _("転倒", "tripping"), -1);
 
                msg_print(NULL);
-               if (buki_motteruka(INVEN_RARM))
+               if (has_melee_weapon(INVEN_RARM))
                {
                        slot = INVEN_RARM;
                        o_ptr = &inventory[INVEN_RARM];
 
-                       if (buki_motteruka(INVEN_LARM) && one_in_(2))
+                       if (has_melee_weapon(INVEN_LARM) && one_in_(2))
                        {
                                o_ptr = &inventory[INVEN_LARM];
                                slot = INVEN_LARM;
                        }
                }
-               else if (buki_motteruka(INVEN_LARM))
+               else if (has_melee_weapon(INVEN_LARM))
                {
                        o_ptr = &inventory[INVEN_LARM];
                        slot = INVEN_LARM;
@@ -4160,7 +4162,7 @@ static void process_command(void)
                        else if (p_ptr->pclass == CLASS_SAMURAI)
                                do_cmd_gain_hissatsu();
                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                               gain_magic();
+                               import_magic_device();
                        else
                                do_cmd_study();
                        break;