From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Thu, 10 Feb 2022 15:10:58 +0000 (+0900)
Subject: [Refactor] #2141 ObjectType *o_ptrの宣言をautoに差し替えた
X-Git-Tag: 3.0.0Alpha54~1^2~35^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a762017055f22fee4a6c3246ada7081c462a3bbe;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #2141 ObjectType *o_ptrの宣言をautoに差し替えた
---

diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp
index 3bb03ea53..df37036d6 100644
--- a/src/action/mutation-execution.cpp
+++ b/src/action/mutation-execution.cpp
@@ -147,7 +147,7 @@ bool exe_mutation_power(PlayerType *player_ptr, PlayerMutationType power)
         return true;
     case PlayerMutationType::DET_CURSE:
         for (int i = 0; i < INVEN_TOTAL; i++) {
-            ObjectType *o_ptr = &player_ptr->inventory_list[i];
+            auto *o_ptr = &player_ptr->inventory_list[i];
             if ((o_ptr->k_idx == 0) || !o_ptr->is_cursed())
                 continue;
 
diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp
index 5f7f3f455..7f682b67b 100644
--- a/src/action/open-close-execution.cpp
+++ b/src/action/open-close-execution.cpp
@@ -190,7 +190,7 @@ bool easy_open_door(PlayerType *player_ptr, POSITION y, POSITION x)
 bool exe_disarm_chest(PlayerType *player_ptr, POSITION y, POSITION x, OBJECT_IDX o_idx)
 {
     bool more = false;
-    ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[o_idx];
+    auto *o_ptr = &player_ptr->current_floor_ptr->o_list[o_idx];
     PlayerEnergy(player_ptr).set_player_turn_energy(100);
     int i = player_ptr->skill_dis;
     if (player_ptr->blind || no_lite(player_ptr))
diff --git a/src/autopick/autopick.cpp b/src/autopick/autopick.cpp
index ced48afce..41f56bdf9 100644
--- a/src/autopick/autopick.cpp
+++ b/src/autopick/autopick.cpp
@@ -101,7 +101,7 @@ void autopick_pickup_items(PlayerType *player_ptr, grid_type *g_ptr)
 {
     for (auto it = g_ptr->o_idx_list.begin(); it != g_ptr->o_idx_list.end();) {
         OBJECT_IDX this_o_idx = *it++;
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[this_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) {
diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index 26bddc029..5b5129756 100644
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -44,7 +44,7 @@ static bool exe_open_chest(PlayerType *player_ptr, POSITION y, POSITION x, OBJEC
 {
     bool flag = true;
     bool more = false;
-    ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[o_idx];
+    auto *o_ptr = &player_ptr->current_floor_ptr->o_list[o_idx];
     PlayerEnergy(player_ptr).set_player_turn_energy(100);
     if (o_ptr->pval > 0) {
         flag = false;
@@ -309,7 +309,7 @@ void do_cmd_bash(PlayerType *player_ptr)
 static bool get_spike(PlayerType *player_ptr, INVENTORY_IDX *ip)
 {
     for (INVENTORY_IDX i = 0; i < INVEN_PACK; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index a005f0359..c42e39aef 100644
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -228,7 +228,7 @@ void exe_eat_food(PlayerType *player_ptr, INVENTORY_IDX item)
         (void)spell_hex.stop_all_spells();
     }
 
-    ObjectType *o_ptr = ref_item(player_ptr, item);
+    auto *o_ptr = ref_item(player_ptr, item);
 
     sound(SOUND_EAT);
 
diff --git a/src/combat/attack-accuracy.cpp b/src/combat/attack-accuracy.cpp
index b30cf84a0..6fcc73359 100644
--- a/src/combat/attack-accuracy.cpp
+++ b/src/combat/attack-accuracy.cpp
@@ -114,7 +114,7 @@ bool check_hit_from_monster_to_monster(int power, DEPTH level, ARMOUR_CLASS ac,
 static bool decide_attack_hit(PlayerType *player_ptr, player_attack_type *pa_ptr, int chance)
 {
     bool success_hit = false;
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     monster_race *r_ptr = &r_info[pa_ptr->m_ptr->r_idx];
     if (((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_POISON_NEEDLE)) || (pa_ptr->mode == HISSATSU_KYUSHO)) {
         int n = 1;
@@ -146,7 +146,7 @@ static bool decide_attack_hit(PlayerType *player_ptr, player_attack_type *pa_ptr
  */
 bool process_attack_hit(PlayerType *player_ptr, player_attack_type *pa_ptr, int chance)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     if (decide_attack_hit(player_ptr, pa_ptr, chance))
         return true;
 
diff --git a/src/combat/attack-criticality.cpp b/src/combat/attack-criticality.cpp
index b990057e8..63932e3a3 100644
--- a/src/combat/attack-criticality.cpp
+++ b/src/combat/attack-criticality.cpp
@@ -119,7 +119,7 @@ static void ninja_critical(PlayerType *player_ptr, player_attack_type *pa_ptr)
  */
 void critical_attack(PlayerType *player_ptr, player_attack_type *pa_ptr)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     monster_race *r_ptr = &r_info[pa_ptr->m_ptr->r_idx];
     if (((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_POISON_NEEDLE)) || (pa_ptr->mode == HISSATSU_KYUSHO)) {
         if ((randint1(randint1(r_ptr->level / 7) + 5) == 1) && !(r_ptr->flags1 & RF1_UNIQUE) && !(r_ptr->flags7 & RF7_UNIQUE2)) {
diff --git a/src/core/object-compressor.cpp b/src/core/object-compressor.cpp
index 64c12629e..44873f7b4 100644
--- a/src/core/object-compressor.cpp
+++ b/src/core/object-compressor.cpp
@@ -24,7 +24,7 @@ static void compact_objects_aux(floor_type *floor_ptr, OBJECT_IDX i1, OBJECT_IDX
     if (i1 == i2)
         return;
 
-    ObjectType *o_ptr = &floor_ptr->o_list[i1];
+    auto *o_ptr = &floor_ptr->o_list[i1];
 
     // モンスター所為アイテムリストもしくは床上アイテムリストの要素番号i1をi2に書き換える
     auto &list = get_o_idx_list_contains(floor_ptr, i1);
diff --git a/src/effect/effect-item.cpp b/src/effect/effect-item.cpp
index 7b104b5c8..9a89bef34 100644
--- a/src/effect/effect-item.cpp
+++ b/src/effect/effect-item.cpp
@@ -55,7 +55,7 @@ bool affect_item(PlayerType *player_ptr, MONSTER_IDX who, POSITION r, POSITION y
 
         processed_list.insert(this_o_idx);
 
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
         bool ignore = false;
         bool do_kill = false;
         concptr note_kill = nullptr;
diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index 4ececbac1..d0e60facc 100644
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -174,7 +174,7 @@ static void parse_qtw_D(PlayerType *player_ptr, qtwg_type *qtwg_ptr, char *s)
             g_ptr->feat = conv_dungeon_feat(floor_ptr, letter[idx].trap);
         } else if (object_index) {
             ObjectType tmp_object;
-            ObjectType *o_ptr = &tmp_object;
+            auto *o_ptr = &tmp_object;
             o_ptr->prep(object_index);
             if (o_ptr->tval == ItemKindType::GOLD) {
                 coin_type = object_index - OBJ_GOLD_LIST;
diff --git a/src/floor/floor-changer.cpp b/src/floor/floor-changer.cpp
index 8d97d79f0..44a23ca42 100644
--- a/src/floor/floor-changer.cpp
+++ b/src/floor/floor-changer.cpp
@@ -178,7 +178,7 @@ static void update_unique_artifact(floor_type *floor_ptr, int16_t cur_floor_id)
     }
 
     for (int i = 1; i < floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &floor_ptr->o_list[i];
+        auto *o_ptr = &floor_ptr->o_list[i];
         if (!o_ptr->is_valid())
             continue;
 
@@ -267,7 +267,7 @@ static void new_floor_allocation(PlayerType *player_ptr, saved_floor_type *sf_pt
     GAME_TURN absence_ticks = (w_ptr->game_turn - tmp_last_visit) / TURNS_PER_TICK;
     reset_unique_by_floor_change(player_ptr);
     for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
         if (!o_ptr->is_valid() || !o_ptr->is_fixed_artifact())
             continue;
 
diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index 562d9bba7..5df2ff66a 100644
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -143,7 +143,7 @@ static byte get_dungeon_feeling(PlayerType *player_ptr)
     }
 
     for (MONSTER_IDX i = 1; i < floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &floor_ptr->o_list[i];
+        auto *o_ptr = &floor_ptr->o_list[i];
         object_kind *k_ptr = &k_info[o_ptr->k_idx];
         int delta = 0;
         if (!o_ptr->is_valid() || (o_ptr->is_known() && ((o_ptr->marked & OM_TOUCHED) != 0)) || ((o_ptr->ident & IDENT_SENSE) != 0))
diff --git a/src/floor/floor-leaver.cpp b/src/floor/floor-leaver.cpp
index 3b1bafb8e..998de3146 100644
--- a/src/floor/floor-leaver.cpp
+++ b/src/floor/floor-leaver.cpp
@@ -264,7 +264,7 @@ static void preserve_info(PlayerType *player_ptr)
     }
 
     for (DUNGEON_IDX i = 0; i < INVEN_PACK; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->is_valid())
             continue;
 
diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp
index a612ca1a5..6b0503568 100644
--- a/src/floor/floor-object.cpp
+++ b/src/floor/floor-object.cpp
@@ -220,7 +220,7 @@ void floor_item_increase(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
 
-    ObjectType *o_ptr = &floor_ptr->o_list[item];
+    auto *o_ptr = &floor_ptr->o_list[item];
     num += o_ptr->number;
     if (num > 255)
         num = 255;
@@ -241,7 +241,7 @@ void floor_item_increase(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER
  */
 void floor_item_optimize(PlayerType *player_ptr, INVENTORY_IDX item)
 {
-    ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[item];
+    auto *o_ptr = &player_ptr->current_floor_ptr->o_list[item];
     if (!o_ptr->k_idx)
         return;
     if (o_ptr->number)
@@ -298,7 +298,7 @@ void excise_object_idx(floor_type *floor_ptr, OBJECT_IDX o_idx)
  */
 ObjectIndexList &get_o_idx_list_contains(floor_type *floor_ptr, OBJECT_IDX o_idx)
 {
-    ObjectType *o_ptr = &floor_ptr->o_list[o_idx];
+    auto *o_ptr = &floor_ptr->o_list[o_idx];
 
     if (o_ptr->is_held_by_monster()) {
         return floor_ptr->m_list[o_ptr->held_m_idx].hold_o_idx_list;
@@ -550,7 +550,7 @@ OBJECT_IDX drop_near(PlayerType *player_ptr, ObjectType *j_ptr, PERCENTAGE chanc
  */
 void floor_item_charges(floor_type *floor_ptr, INVENTORY_IDX item)
 {
-    ObjectType *o_ptr = &floor_ptr->o_list[item];
+    auto *o_ptr = &floor_ptr->o_list[item];
     if ((o_ptr->tval != ItemKindType::STAFF) && (o_ptr->tval != ItemKindType::WAND))
         return;
     if (!o_ptr->is_known())
@@ -579,7 +579,7 @@ void floor_item_charges(floor_type *floor_ptr, INVENTORY_IDX item)
  */
 void floor_item_describe(PlayerType *player_ptr, INVENTORY_IDX item)
 {
-    ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[item];
+    auto *o_ptr = &player_ptr->current_floor_ptr->o_list[item];
     GAME_TEXT o_name[MAX_NLEN];
     describe_flavor(player_ptr, o_name, o_ptr, 0);
 #ifdef JP
diff --git a/src/floor/floor-streams.cpp b/src/floor/floor-streams.cpp
index 799b6ad5e..afd35c423 100644
--- a/src/floor/floor-streams.cpp
+++ b/src/floor/floor-streams.cpp
@@ -340,7 +340,7 @@ void build_streamer(PlayerType *player_ptr, FEAT_IDX feat, int chance)
 
                 /* Scan all objects in the grid */
                 for (const auto this_o_idx : g_ptr->o_idx_list) {
-                    ObjectType *o_ptr = &floor_ptr->o_list[this_o_idx];
+                    auto *o_ptr = &floor_ptr->o_list[this_o_idx];
 
                     /* Hack -- Preserve unknown artifacts */
                     if (o_ptr->is_fixed_artifact()) {
diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp
index 4de64bf42..f3bae02a6 100644
--- a/src/floor/floor-util.cpp
+++ b/src/floor/floor-util.cpp
@@ -119,7 +119,7 @@ void forget_flow(floor_type *floor_ptr)
 void wipe_o_list(floor_type *floor_ptr)
 {
     for (OBJECT_IDX i = 1; i < floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &floor_ptr->o_list[i];
+        auto *o_ptr = &floor_ptr->o_list[i];
         if (!o_ptr->is_valid())
             continue;
 
diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp
index 0101ad2c6..5e6125301 100644
--- a/src/grid/grid.cpp
+++ b/src/grid/grid.cpp
@@ -329,7 +329,7 @@ void note_spot(PlayerType *player_ptr, POSITION y, POSITION x)
 
     /* Hack -- memorize objects */
     for (const auto this_o_idx : g_ptr->o_idx_list) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
 
         /* Memorize objects */
         o_ptr->marked |= OM_FOUND;
diff --git a/src/hpmp/hp-mp-regenerator.cpp b/src/hpmp/hp-mp-regenerator.cpp
index 34c20e454..3edd9c84e 100644
--- a/src/hpmp/hp-mp-regenerator.cpp
+++ b/src/hpmp/hp-mp-regenerator.cpp
@@ -204,7 +204,7 @@ void regenerate_captured_monsters(PlayerType *player_ptr)
     bool heal = false;
     for (int i = 0; i < INVEN_TOTAL; i++) {
         monster_race *r_ptr;
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
         if (o_ptr->tval != ItemKindType::CAPTURE)
diff --git a/src/inventory/inventory-curse.cpp b/src/inventory/inventory-curse.cpp
index addc35102..de112a872 100644
--- a/src/inventory/inventory-curse.cpp
+++ b/src/inventory/inventory-curse.cpp
@@ -149,7 +149,7 @@ ObjectType *choose_cursed_obj_name(PlayerType *player_ptr, CurseTraitType flag)
         return nullptr;
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (o_ptr->curse_flags.has(flag)) {
             choices[number] = i;
             number++;
@@ -453,7 +453,7 @@ void execute_cursed_items_effect(PlayerType *player_ptr)
     if (!one_in_(999) || player_ptr->anti_magic || (one_in_(2) && has_resist_curse(player_ptr)))
         return;
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
     if (o_ptr->name1 != ART_JUDGE)
         return;
 
diff --git a/src/inventory/inventory-object.cpp b/src/inventory/inventory-object.cpp
index 76e2a04f3..382aae74e 100644
--- a/src/inventory/inventory-object.cpp
+++ b/src/inventory/inventory-object.cpp
@@ -40,7 +40,7 @@ void vary_item(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER num)
  */
 void inven_item_increase(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER num)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[item];
+    auto *o_ptr = &player_ptr->inventory_list[item];
     num += o_ptr->number;
     if (num > 255)
         num = 255;
@@ -75,7 +75,7 @@ void inven_item_increase(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER
  */
 void inven_item_optimize(PlayerType *player_ptr, INVENTORY_IDX item)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[item];
+    auto *o_ptr = &player_ptr->inventory_list[item];
     if (!o_ptr->k_idx)
         return;
     if (o_ptr->number)
diff --git a/src/inventory/inventory-util.cpp b/src/inventory/inventory-util.cpp
index 96e4ea9ca..787214e9d 100644
--- a/src/inventory/inventory-util.cpp
+++ b/src/inventory/inventory-util.cpp
@@ -45,7 +45,7 @@ bool is_ring_slot(int i) { return (i == INVEN_MAIN_RING) || (i == INVEN_SUB_RING
 bool get_tag_floor(floor_type *floor_ptr, COMMAND_CODE *cp, char tag, FLOOR_IDX floor_list[], ITEM_NUMBER floor_num)
 {
     for (COMMAND_CODE i = 0; i < floor_num && i < 23; i++) {
-        ObjectType *o_ptr = &floor_ptr->o_list[floor_list[i]];
+        auto *o_ptr = &floor_ptr->o_list[floor_list[i]];
         if (!o_ptr->inscription)
             continue;
 
@@ -65,7 +65,7 @@ bool get_tag_floor(floor_type *floor_ptr, COMMAND_CODE *cp, char tag, FLOOR_IDX
     }
 
     for (COMMAND_CODE i = 0; i < floor_num && i < 23; i++) {
-        ObjectType *o_ptr = &floor_ptr->o_list[floor_list[i]];
+        auto *o_ptr = &floor_ptr->o_list[floor_list[i]];
         if (!o_ptr->inscription)
             continue;
 
@@ -118,7 +118,7 @@ bool get_tag(PlayerType *player_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode,
     }
 
     for (COMMAND_CODE i = start; i <= end; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if ((o_ptr->k_idx == 0) || (o_ptr->inscription == 0))
             continue;
 
@@ -140,7 +140,7 @@ bool get_tag(PlayerType *player_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode,
         return false;
 
     for (COMMAND_CODE i = start; i <= end; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if ((o_ptr->k_idx == 0) || (o_ptr->inscription == 0))
             continue;
 
diff --git a/src/inventory/recharge-processor.cpp b/src/inventory/recharge-processor.cpp
index ecc8973c7..c23f5dc76 100644
--- a/src/inventory/recharge-processor.cpp
+++ b/src/inventory/recharge-processor.cpp
@@ -55,7 +55,7 @@ void recharge_magic_items(PlayerType *player_ptr)
     bool changed;
 
     for (changed = false, i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
@@ -79,7 +79,7 @@ void recharge_magic_items(PlayerType *player_ptr)
      * one per turn. -LM-
      */
     for (changed = false, i = 0; i < INVEN_PACK; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         object_kind *k_ptr = &k_info[o_ptr->k_idx];
         if (!o_ptr->k_idx)
             continue;
@@ -108,7 +108,7 @@ void recharge_magic_items(PlayerType *player_ptr)
     }
 
     for (i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
         if (!o_ptr->is_valid())
             continue;
 
diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp
index d1117186d..79d73e24a 100644
--- a/src/io/input-key-requester.cpp
+++ b/src/io/input-key-requester.cpp
@@ -338,7 +338,7 @@ void request_command(PlayerType *player_ptr, int shopping)
 #endif
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
diff --git a/src/knowledge/knowledge-inventory.cpp b/src/knowledge/knowledge-inventory.cpp
index 2471ad2c5..892f868d5 100644
--- a/src/knowledge/knowledge-inventory.cpp
+++ b/src/knowledge/knowledge-inventory.cpp
@@ -216,7 +216,7 @@ static void show_wearing_equipment_resistances(PlayerType *player_ptr, ItemKindT
     char where[32];
     strcpy(where, _("装", "E "));
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!check_item_knowledge(o_ptr, tval))
             continue;
 
@@ -237,7 +237,7 @@ static void show_holding_equipment_resistances(PlayerType *player_ptr, ItemKindT
     char where[32];
     strcpy(where, _("持", "I "));
     for (int i = 0; i < INVEN_PACK; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!check_item_knowledge(o_ptr, tval))
             continue;
 
@@ -260,7 +260,7 @@ static void show_home_equipment_resistances(PlayerType *player_ptr, ItemKindType
     char where[32];
     strcpy(where, _("家", "H "));
     for (int i = 0; i < store_ptr->stock_num; i++) {
-        ObjectType *o_ptr = &store_ptr->stock[i];
+        auto *o_ptr = &store_ptr->stock[i];
         if (!check_item_knowledge(o_ptr, tval))
             continue;
 
diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp
index 54388a7fc..227ac0b9d 100644
--- a/src/knowledge/knowledge-items.cpp
+++ b/src/knowledge/knowledge-items.cpp
@@ -76,7 +76,7 @@ void do_cmd_knowledge_artifacts(PlayerType *player_ptr)
     }
 
     for (ARTIFACT_IDX i = 0; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
         if (!o_ptr->is_fixed_artifact())
diff --git a/src/mind/mind-magic-eater.cpp b/src/mind/mind-magic-eater.cpp
index ca0f5513d..51fd6aecf 100644
--- a/src/mind/mind-magic-eater.cpp
+++ b/src/mind/mind-magic-eater.cpp
@@ -24,7 +24,7 @@ bool import_magic_device(PlayerType *player_ptr)
     concptr q = _("どのアイテムの魔力を取り込みますか? ", "Gain power of which item? ");
     concptr s = _("魔力を取り込めるアイテムがない。", "There's nothing with power to absorb.");
     OBJECT_IDX item;
-    ObjectType *o_ptr = choose_object(player_ptr, &item, q, s, USE_INVEN | USE_FLOOR, FuncItemTester(&ObjectType::is_rechargeable));
+    auto *o_ptr = choose_object(player_ptr, &item, q, s, USE_INVEN | USE_FLOOR, FuncItemTester(&ObjectType::is_rechargeable));
     if (!o_ptr)
         return false;
 
diff --git a/src/mind/mind-priest.cpp b/src/mind/mind-priest.cpp
index 526a9fc32..e2bd6cb2d 100644
--- a/src/mind/mind-priest.cpp
+++ b/src/mind/mind-priest.cpp
@@ -29,7 +29,7 @@ bool bless_weapon(PlayerType *player_ptr)
     concptr s = _("祝福できる武器がありません。", "You have no weapon to bless.");
 
     OBJECT_IDX item;
-    ObjectType *o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, FuncItemTester(&ObjectType::is_weapon));
+    auto *o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, FuncItemTester(&ObjectType::is_weapon));
     if (!o_ptr)
         return false;
 
diff --git a/src/mind/mind-samurai.cpp b/src/mind/mind-samurai.cpp
index f9abde2b4..438c59c5d 100644
--- a/src/mind/mind-samurai.cpp
+++ b/src/mind/mind-samurai.cpp
@@ -417,7 +417,7 @@ bool choose_samurai_stance(PlayerType *player_ptr)
  */
 int calc_attack_quality(PlayerType *player_ptr, player_attack_type *pa_ptr)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     int bonus = player_ptr->to_h[pa_ptr->hand] + o_ptr->to_h;
     int chance = (player_ptr->skill_thn + (bonus * BTH_PLUS_ADJ));
     if (pa_ptr->mode == HISSATSU_IAI)
diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index 8e6c8fc77..a8243e32e 100644
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -526,7 +526,7 @@ MULTIPLY calc_snipe_damage_with_slay(PlayerType *player_ptr, MULTIPLY mult, mons
  */
 static bool cast_sniper_spell(PlayerType *player_ptr, int spell)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_BOW];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_BOW];
     SPELL_IDX snipe_type = SP_NONE;
 
     if (o_ptr->tval != ItemKindType::BOW) {
diff --git a/src/monster-floor/monster-object.cpp b/src/monster-floor/monster-object.cpp
index 71841bbe2..e2fcc2dda 100644
--- a/src/monster-floor/monster-object.cpp
+++ b/src/monster-floor/monster-object.cpp
@@ -161,7 +161,7 @@ void update_object_by_monster_movement(PlayerType *player_ptr, turn_flags *turn_
         BIT_FLAGS flg2 = 0L, flg3 = 0L, flgr = 0L;
         GAME_TEXT m_name[MAX_NLEN], o_name[MAX_NLEN];
         OBJECT_IDX this_o_idx = *it++;
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
 
         if (turn_flags_ptr->do_take) {
             /* Skip gold, corpse and statue */
diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp
index dac5f1c4f..e4dee2fdf 100644
--- a/src/mspell/mspell-checker.cpp
+++ b/src/mspell/mspell-checker.cpp
@@ -112,7 +112,7 @@ bool raise_possible(PlayerType *player_ptr, monster_type *m_ptr)
 
             g_ptr = &floor_ptr->grid_array[yy][xx];
             for (const auto this_o_idx : g_ptr->o_idx_list) {
-                ObjectType *o_ptr = &floor_ptr->o_list[this_o_idx];
+                auto *o_ptr = &floor_ptr->o_list[this_o_idx];
                 if (o_ptr->tval == ItemKindType::CORPSE) {
                     if (!monster_has_hostile_align(player_ptr, m_ptr, 0, 0, &r_info[o_ptr->pval]))
                         return true;
diff --git a/src/object-activation/activation-switcher.cpp b/src/object-activation/activation-switcher.cpp
index f9fe32828..65109c4c0 100644
--- a/src/object-activation/activation-switcher.cpp
+++ b/src/object-activation/activation-switcher.cpp
@@ -42,7 +42,7 @@
 
 bool switch_activation(PlayerType *player_ptr, ObjectType **o_ptr_ptr, const activation_type *const act_ptr, concptr name)
 {
-    ObjectType *o_ptr = (*o_ptr_ptr);
+    auto *o_ptr = (*o_ptr_ptr);
 
     switch (act_ptr->index) {
     case RandomArtActType::SUNLIGHT:
diff --git a/src/object-enchant/object-curse.cpp b/src/object-enchant/object-curse.cpp
index 40d99a852..b98c1afcc 100644
--- a/src/object-enchant/object-curse.cpp
+++ b/src/object-enchant/object-curse.cpp
@@ -64,7 +64,7 @@ void curse_equipment(PlayerType *player_ptr, PERCENTAGE chance, PERCENTAGE heavy
     if (randint1(100) > chance)
         return;
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + randint0(12)];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + randint0(12)];
     if (!o_ptr->k_idx)
         return;
     auto oflgs = object_flags(o_ptr);
diff --git a/src/object-enchant/vorpal-weapon.cpp b/src/object-enchant/vorpal-weapon.cpp
index 3e1c98cf5..c1deeaa5e 100644
--- a/src/object-enchant/vorpal-weapon.cpp
+++ b/src/object-enchant/vorpal-weapon.cpp
@@ -78,7 +78,7 @@ void process_vorpal_attack(PlayerType *player_ptr, player_attack_type *pa_ptr, c
     if (!vorpal_cut)
         return;
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     int vorpal_magnification = 2;
     print_chainsword_noise(o_ptr);
     if (o_ptr->name1 == ART_VORPAL_BLADE)
diff --git a/src/object/lite-processor.cpp b/src/object/lite-processor.cpp
index f3d176d89..24bfe06dd 100644
--- a/src/object/lite-processor.cpp
+++ b/src/object/lite-processor.cpp
@@ -18,7 +18,7 @@
  */
 void reduce_lite_life(PlayerType *player_ptr)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
     if (o_ptr->tval != ItemKindType::LITE)
         return;
 
diff --git a/src/object/warning.cpp b/src/object/warning.cpp
index 313ae56cd..41692c066 100644
--- a/src/object/warning.cpp
+++ b/src/object/warning.cpp
@@ -56,7 +56,7 @@ ObjectType *choose_warning_item(PlayerType *player_ptr)
     /* Search Inventory */
     int number = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
 
         auto flgs = object_flags(o_ptr);
         if (flgs.has(TR_WARNING)) {
@@ -533,7 +533,7 @@ bool process_warning(PlayerType *player_ptr, POSITION xx, POSITION yy)
         old_damage = dam_max * 3 / 2;
 
         if (dam_max > player_ptr->chp / 2) {
-            ObjectType *o_ptr = choose_warning_item(player_ptr);
+            auto *o_ptr = choose_warning_item(player_ptr);
 
             if (o_ptr) {
                 describe_flavor(player_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
@@ -556,7 +556,7 @@ bool process_warning(PlayerType *player_ptr, POSITION xx, POSITION yy)
         return true;
     }
 
-    ObjectType *o_ptr = choose_warning_item(player_ptr);
+    auto *o_ptr = choose_warning_item(player_ptr);
     if (o_ptr != nullptr) {
         describe_flavor(player_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
     } else {
diff --git a/src/perception/simple-perception.cpp b/src/perception/simple-perception.cpp
index c7b161fb4..99921b941 100644
--- a/src/perception/simple-perception.cpp
+++ b/src/perception/simple-perception.cpp
@@ -34,7 +34,7 @@
  */
 static void sense_inventory_aux(PlayerType *player_ptr, INVENTORY_IDX slot, bool heavy)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[slot];
+    auto *o_ptr = &player_ptr->inventory_list[slot];
     GAME_TEXT o_name[MAX_NLEN];
     if (o_ptr->ident & (IDENT_SENSE))
         return;
diff --git a/src/player-attack/attack-chaos-effect.cpp b/src/player-attack/attack-chaos-effect.cpp
index f956a4f36..a12c9b721 100644
--- a/src/player-attack/attack-chaos-effect.cpp
+++ b/src/player-attack/attack-chaos-effect.cpp
@@ -266,7 +266,7 @@ static void attack_golden_hammer(PlayerType *player_ptr, player_attack_type *pa_
 void change_monster_stat(PlayerType *player_ptr, player_attack_type *pa_ptr, const POSITION y, const POSITION x, int *num)
 {
     monster_race *r_ptr = &r_info[pa_ptr->m_ptr->r_idx];
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
 
     if (any_bits(player_ptr->special_attack, ATTACK_CONFUSE) || pa_ptr->chaos_effect == CE_CONFUSION || pa_ptr->mode == HISSATSU_CONF
         || SpellHex(player_ptr).is_spelling_specific(HEX_CONFUSION))
diff --git a/src/player-attack/blood-sucking-processor.cpp b/src/player-attack/blood-sucking-processor.cpp
index a3e5e8b9f..625e8ba16 100644
--- a/src/player-attack/blood-sucking-processor.cpp
+++ b/src/player-attack/blood-sucking-processor.cpp
@@ -61,7 +61,7 @@ static void drain_muramasa(PlayerType *player_ptr, player_attack_type *pa_ptr, c
     if (!is_human)
         return;
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     HIT_PROB to_h = o_ptr->to_h;
     HIT_POINT to_d = o_ptr->to_d;
     bool flag = true;
@@ -142,7 +142,7 @@ void process_drain(PlayerType *player_ptr, player_attack_type *pa_ptr, const boo
     if (!pa_ptr->can_drain || (pa_ptr->drain_result <= 0))
         return;
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     if (o_ptr->name1 == ART_MURAMASA)
         drain_muramasa(player_ptr, pa_ptr, is_human);
     else
diff --git a/src/player-attack/player-attack.cpp b/src/player-attack/player-attack.cpp
index 5089ddaf9..f774e82e0 100644
--- a/src/player-attack/player-attack.cpp
+++ b/src/player-attack/player-attack.cpp
@@ -143,7 +143,7 @@ static void get_weapon_exp(PlayerType *player_ptr, player_attack_type *pa_ptr)
 static void get_attack_exp(PlayerType *player_ptr, player_attack_type *pa_ptr)
 {
     monster_race *r_ptr = &r_info[pa_ptr->m_ptr->r_idx];
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     if (o_ptr->k_idx == 0) {
         get_bare_knuckle_exp(player_ptr, pa_ptr);
         return;
@@ -170,7 +170,7 @@ static void calc_num_blow(PlayerType *player_ptr, player_attack_type *pa_ptr)
     else
         pa_ptr->num_blow = player_ptr->num_blow[pa_ptr->hand];
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     if ((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_POISON_NEEDLE))
         pa_ptr->num_blow = 1;
 }
@@ -311,7 +311,7 @@ static bool does_weapon_has_flag(BIT_FLAGS &attacker_flags, player_attack_type *
  */
 static void process_weapon_attack(PlayerType *player_ptr, player_attack_type *pa_ptr, bool *do_quake, const bool vorpal_cut, const int vorpal_chance)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     auto dd = o_ptr->dd + player_ptr->to_dd[pa_ptr->hand] + magical_brand_extra_dice(pa_ptr);
     pa_ptr->attack_damage = damroll(dd, o_ptr->ds + player_ptr->to_ds[pa_ptr->hand]);
     pa_ptr->attack_damage = calc_attack_damage_with_slay(player_ptr, o_ptr, pa_ptr->attack_damage, pa_ptr->m_ptr, pa_ptr->mode, false);
@@ -342,7 +342,7 @@ static void process_weapon_attack(PlayerType *player_ptr, player_attack_type *pa
  */
 static void calc_attack_damage(PlayerType *player_ptr, player_attack_type *pa_ptr, bool *do_quake, const bool vorpal_cut, const int vorpal_chance)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     pa_ptr->attack_damage = 1;
     if (pa_ptr->monk_attack) {
         process_monk_attack(player_ptr, pa_ptr);
@@ -437,7 +437,7 @@ static bool check_fear_death(PlayerType *player_ptr, player_attack_type *pa_ptr,
         }
     }
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     if ((o_ptr->name1 == ART_ZANTETSU) && is_lowlevel)
         msg_print(_("またつまらぬものを斬ってしまった．．．", "Sigh... Another trifling thing I've cut...."));
 
@@ -455,7 +455,7 @@ static bool check_fear_death(PlayerType *player_ptr, player_attack_type *pa_ptr,
 static void apply_actual_attack(
     PlayerType *player_ptr, player_attack_type *pa_ptr, bool *do_quake, const bool is_zantetsu_nullified, const bool is_ej_nullified)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     int vorpal_chance = ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD)) ? 2 : 4;
 
     sound(SOUND_HIT);
@@ -529,7 +529,7 @@ void exe_player_attack_to_monster(PlayerType *player_ptr, POSITION y, POSITION x
     monster_desc(player_ptr, pa_ptr->m_name, pa_ptr->m_ptr, 0);
 
     int chance = calc_attack_quality(player_ptr, pa_ptr);
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     bool is_zantetsu_nullified = ((o_ptr->name1 == ART_ZANTETSU) && (pa_ptr->r_ptr->d_char == 'j'));
     bool is_ej_nullified = ((o_ptr->name1 == ART_EXCALIBUR_J) && (pa_ptr->r_ptr->d_char == 'S'));
     calc_num_blow(player_ptr, pa_ptr);
diff --git a/src/player-info/base-status-info.cpp b/src/player-info/base-status-info.cpp
index 7b24faa8c..bf8579d92 100644
--- a/src/player-info/base-status-info.cpp
+++ b/src/player-info/base-status-info.cpp
@@ -10,7 +10,7 @@
 void set_equipment_influence(PlayerType *player_ptr, self_info_type *self_ptr)
 {
     for (int k = INVEN_MAIN_HAND; k < INVEN_TOTAL; k++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[k];
+        auto *o_ptr = &player_ptr->inventory_list[k];
         if (o_ptr->k_idx == 0)
             continue;
 
diff --git a/src/player-info/weapon-effect-info.cpp b/src/player-info/weapon-effect-info.cpp
index 5adf18d87..57edc1281 100644
--- a/src/player-info/weapon-effect-info.cpp
+++ b/src/player-info/weapon-effect-info.cpp
@@ -102,7 +102,7 @@ static void set_slay_info(self_info_type *self_ptr)
 
 void set_weapon_effect_info(PlayerType *player_ptr, self_info_type *self_ptr)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND];
     if (o_ptr->k_idx == 0)
         return;
 
diff --git a/src/player-status/player-status-base.cpp b/src/player-status/player-status-base.cpp
index 568eb9719..643438a6e 100644
--- a/src/player-status/player-status-base.cpp
+++ b/src/player-status/player-status-base.cpp
@@ -234,7 +234,7 @@ int16_t PlayerStatusBase::equipments_value()
     this->set_locals(); /* 計算前に値のセット。派生クラスの値がセットされる。*/
     int16_t result = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         auto flgs = object_flags(o_ptr);
 
         if (!o_ptr->k_idx)
diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp
index d24bca5a9..c27b8c63b 100644
--- a/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@ -1633,7 +1633,7 @@ BIT_FLAGS has_lite(PlayerType *player_ptr)
 bool has_disable_two_handed_bonus(PlayerType *player_ptr, int i)
 {
     if (has_melee_weapon(player_ptr, INVEN_MAIN_HAND + i) && has_two_handed_weapons(player_ptr)) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + i];
+        auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + i];
         int limit = calc_weapon_weight_limit(player_ptr);
 
         /* Enable when two hand wields an enough light weapon */
diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 2b350bc8f..e2c1bbdf8 100644
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -1384,7 +1384,7 @@ static bool is_martial_arts_mode(PlayerType *player_ptr)
 
 static bool is_heavy_wield(PlayerType *player_ptr, int i)
 {
-    const ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + i];
+    const auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + i];
 
     return has_melee_weapon(player_ptr, INVEN_MAIN_HAND + i) && (calc_weapon_weight_limit(player_ptr) < o_ptr->weight / 10);
 }
@@ -1687,7 +1687,7 @@ static ARMOUR_CLASS calc_to_ac(PlayerType *player_ptr, bool is_real_value)
         }
 
         for (int i = INVEN_MAIN_HAND; i <= INVEN_FEET; i++) {
-            ObjectType *o_ptr = &player_ptr->inventory_list[i];
+            auto *o_ptr = &player_ptr->inventory_list[i];
             if (!o_ptr->k_idx)
                 continue;
             if (!o_ptr->is_armour())
@@ -1921,7 +1921,7 @@ void put_equipment_warning(PlayerType *player_ptr)
 
 static short calc_to_damage(PlayerType *player_ptr, INVENTORY_IDX slot, bool is_real_value)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[slot];
+    auto *o_ptr = &player_ptr->inventory_list[slot];
     auto flgs = object_flags(o_ptr);
 
     player_hand calc_hand = PLAYER_HAND_OTHER;
@@ -2121,7 +2121,7 @@ static short calc_to_hit(PlayerType *player_ptr, INVENTORY_IDX slot, bool is_rea
     /* Bonuses and penalties by weapon */
     PlayerClass pc(player_ptr);
     if (has_melee_weapon(player_ptr, slot)) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[slot];
+        auto *o_ptr = &player_ptr->inventory_list[slot];
         auto flgs = object_flags(o_ptr);
 
         /* Traind bonuses */
@@ -2200,7 +2200,7 @@ static short calc_to_hit(PlayerType *player_ptr, INVENTORY_IDX slot, bool is_rea
 
     /* Bonuses from inventory */
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
 
         /* Ignore empty hands, handed weapons, bows and capture balls */
         if (!o_ptr->k_idx || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i))
@@ -2316,7 +2316,7 @@ static int16_t calc_to_hit_bow(PlayerType *player_ptr, bool is_real_value)
         pow -= 12;
     }
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_BOW];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_BOW];
 
     if (is_heavy_shoot(player_ptr, o_ptr)) {
         pow += 2 * (calc_bow_weight_limit(player_ptr) - o_ptr->weight / 10);
diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp
index ba643aacc..80f476d42 100644
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -61,7 +61,7 @@ void calc_android_exp(PlayerType *player_ptr)
         return;
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         ObjectType forge;
         ObjectType *q_ptr = &forge;
         uint32_t value, exp;
diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index d331368b5..b27f033a2 100644
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -559,7 +559,7 @@ concptr do_hex_spell(PlayerType *player_ptr, spell_hex_type spell, SpellProcessT
         if (description)
             return _("影のオーラを身にまとい、敵に影のダメージを与える。", "Gives aura of shadow.");
         if (cast) {
-            ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
+            auto *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
 
             if (!o_ptr->k_idx) {
                 msg_print(_("クロークを身につけていない！", "You are not wearing a cloak."));
@@ -572,7 +572,7 @@ concptr do_hex_spell(PlayerType *player_ptr, spell_hex_type spell, SpellProcessT
             }
         }
         if (continuation) {
-            ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
+            auto *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
 
             if ((!o_ptr->k_idx) || (!o_ptr->is_cursed())) {
                 exe_spell(player_ptr, REALM_HEX, spell, SpellProcessType::STOP);
diff --git a/src/save/floor-writer.cpp b/src/save/floor-writer.cpp
index 48b892890..38961c97a 100644
--- a/src/save/floor-writer.cpp
+++ b/src/save/floor-writer.cpp
@@ -132,7 +132,7 @@ void wr_saved_floor(PlayerType *player_ptr, saved_floor_type *sf_ptr)
     /*** Dump objects ***/
     wr_u16b(floor_ptr->o_max);
     for (int i = 1; i < floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &floor_ptr->o_list[i];
+        auto *o_ptr = &floor_ptr->o_list[i];
         wr_item(o_ptr);
     }
 
diff --git a/src/save/save.cpp b/src/save/save.cpp
index c1714c485..99ffd4af9 100644
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -188,7 +188,7 @@ static bool wr_savefile_new(PlayerType *player_ptr, save_type type)
         wr_byte((byte)player_ptr->spell_order[i]);
 
     for (int i = 0; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
diff --git a/src/specific-object/chest.cpp b/src/specific-object/chest.cpp
index e8a8e9fc3..053df2ea2 100644
--- a/src/specific-object/chest.cpp
+++ b/src/specific-object/chest.cpp
@@ -65,7 +65,7 @@ void Chest::chest_death(bool scatter, POSITION y, POSITION x, OBJECT_IDX o_idx)
     ObjectType *q_ptr;
 
     auto *floor_ptr = this->player_ptr->current_floor_ptr;
-    ObjectType *o_ptr = &floor_ptr->o_list[o_idx];
+    auto *o_ptr = &floor_ptr->o_list[o_idx];
 
     /* Small chests often hold "gold" */
     small = (o_ptr->sval < SV_CHEST_MIN_LARGE);
@@ -157,7 +157,7 @@ void Chest::chest_trap(POSITION y, POSITION x, OBJECT_IDX o_idx)
 {
     int i;
 
-    ObjectType *o_ptr = &this->player_ptr->current_floor_ptr->o_list[o_idx];
+    auto *o_ptr = &this->player_ptr->current_floor_ptr->o_list[o_idx];
 
     int mon_level = o_ptr->xtra3;
 
diff --git a/src/specific-object/death-scythe.cpp b/src/specific-object/death-scythe.cpp
index f6919737c..2c5727404 100644
--- a/src/specific-object/death-scythe.cpp
+++ b/src/specific-object/death-scythe.cpp
@@ -140,7 +140,7 @@ void process_death_scythe_reflection(PlayerType *player_ptr, player_attack_type
     msg_format(_("ミス！ %sにかわされた。", "You miss %s."), pa_ptr->m_name);
     msg_print(_("振り回した大鎌が自分自身に返ってきた！", "Your scythe returns to you!"));
 
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand];
     auto death_scythe_flags = object_flags(o_ptr);
     pa_ptr->attack_damage = damroll(o_ptr->dd + player_ptr->to_dd[pa_ptr->hand], o_ptr->ds + player_ptr->to_ds[pa_ptr->hand]);
     int magnification = calc_death_scythe_reflection_magnification(player_ptr);
diff --git a/src/spell-kind/spells-curse-removal.cpp b/src/spell-kind/spells-curse-removal.cpp
index ba4f2cb05..48f127069 100644
--- a/src/spell-kind/spells-curse-removal.cpp
+++ b/src/spell-kind/spells-curse-removal.cpp
@@ -20,7 +20,7 @@ static int exe_curse_removal(PlayerType *player_ptr, int all)
 {
     int cnt = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
         if (!o_ptr->is_cursed())
diff --git a/src/spell-kind/spells-detection.cpp b/src/spell-kind/spells-detection.cpp
index 891cf684c..edbd0ec37 100644
--- a/src/spell-kind/spells-detection.cpp
+++ b/src/spell-kind/spells-detection.cpp
@@ -173,7 +173,7 @@ bool detect_objects_gold(PlayerType *player_ptr, POSITION range)
     bool detect = false;
     POSITION y, x;
     for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
 
         if (!o_ptr->is_valid())
             continue;
@@ -219,7 +219,7 @@ bool detect_objects_normal(PlayerType *player_ptr, POSITION range)
 
     bool detect = false;
     for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
 
         if (!o_ptr->is_valid())
             continue;
@@ -274,7 +274,7 @@ bool detect_objects_magic(PlayerType *player_ptr, POSITION range)
     ItemKindType tv;
     bool detect = false;
     for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
 
         if (!o_ptr->is_valid())
             continue;
diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp
index 96b49cfbb..7b146c614 100644
--- a/src/spell-kind/spells-floor.cpp
+++ b/src/spell-kind/spells-floor.cpp
@@ -63,7 +63,7 @@ void wiz_lite(PlayerType *player_ptr, bool ninja)
 {
     /* Memorize objects */
     for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
         if (!o_ptr->is_valid())
             continue;
         if (o_ptr->is_held_by_monster())
@@ -156,7 +156,7 @@ void wiz_dark(PlayerType *player_ptr)
 
     /* Forget all objects */
     for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
-        ObjectType *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+        auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
 
         if (!o_ptr->is_valid())
             continue;
diff --git a/src/spell-kind/spells-perception.cpp b/src/spell-kind/spells-perception.cpp
index df230f9f6..5d18bfc5a 100644
--- a/src/spell-kind/spells-perception.cpp
+++ b/src/spell-kind/spells-perception.cpp
@@ -39,7 +39,7 @@
 void identify_pack(PlayerType *player_ptr)
 {
     for (INVENTORY_IDX i = 0; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
diff --git a/src/spell-kind/spells-polymorph.cpp b/src/spell-kind/spells-polymorph.cpp
index 4215a7433..8826b5c31 100644
--- a/src/spell-kind/spells-polymorph.cpp
+++ b/src/spell-kind/spells-polymorph.cpp
@@ -111,7 +111,7 @@ bool polymorph_monster(PlayerType *player_ptr, POSITION y, POSITION x)
 
     if (preserve_hold_objects) {
         for (const auto this_o_idx : back_m.hold_o_idx_list) {
-            ObjectType *o_ptr = &floor_ptr->o_list[this_o_idx];
+            auto *o_ptr = &floor_ptr->o_list[this_o_idx];
             o_ptr->held_m_idx = hack_m_idx_ii;
         }
     } else {
diff --git a/src/spell-realm/spells-arcane.cpp b/src/spell-realm/spells-arcane.cpp
index 6647b1a77..2b3fbc0d7 100644
--- a/src/spell-realm/spells-arcane.cpp
+++ b/src/spell-realm/spells-arcane.cpp
@@ -14,7 +14,7 @@
 void phlogiston(PlayerType *player_ptr)
 {
     GAME_TURN max_flog = 0;
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
     if ((o_ptr->tval == ItemKindType::LITE) && (o_ptr->sval == SV_LITE_LANTERN))
         max_flog = FUEL_LAMP;
     else if ((o_ptr->tval == ItemKindType::LITE) && (o_ptr->sval == SV_LITE_TORCH))
diff --git a/src/spell-realm/spells-craft.cpp b/src/spell-realm/spells-craft.cpp
index 5997e8d54..609025564 100644
--- a/src/spell-realm/spells-craft.cpp
+++ b/src/spell-realm/spells-craft.cpp
@@ -265,7 +265,7 @@ bool pulish_shield(PlayerType *player_ptr)
     concptr s = _("磨く盾がありません。", "You have no shield to polish.");
 
     OBJECT_IDX item;
-    ObjectType *o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, TvalItemTester(ItemKindType::SHIELD));
+    auto *o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, TvalItemTester(ItemKindType::SHIELD));
     if (o_ptr == nullptr)
         return false;
 
diff --git a/src/spell-realm/spells-nature.cpp b/src/spell-realm/spells-nature.cpp
index 832d05ea8..eaebd02bc 100644
--- a/src/spell-realm/spells-nature.cpp
+++ b/src/spell-realm/spells-nature.cpp
@@ -22,7 +22,7 @@ bool rustproof(PlayerType *player_ptr)
     concptr q = _("どの防具に錆止めをしますか？", "Rustproof which piece of armour? ");
     concptr s = _("錆止めできるものがありません。", "You have nothing to rustproof.");
     OBJECT_IDX item;
-    ObjectType *o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, FuncItemTester(&ObjectType::is_armour));
+    auto *o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, FuncItemTester(&ObjectType::is_armour));
     if (o_ptr == nullptr)
         return false;
 
diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp
index 26eb76ae2..e7f9cd1b5 100644
--- a/src/spell/spells-object.cpp
+++ b/src/spell/spells-object.cpp
@@ -324,7 +324,7 @@ void brand_bolts(PlayerType *player_ptr)
 {
     /* Use the first acceptable bolts */
     for (int i = 0; i < INVEN_PACK; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
 
         /* Skip non-bolts */
         if (o_ptr->tval != ItemKindType::BOLT)
diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index d98847154..78e869d10 100644
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -550,7 +550,7 @@ bool fishing(PlayerType *player_ptr)
  */
 bool cosmic_cast_off(PlayerType *player_ptr, ObjectType **o_ptr_ptr)
 {
-    ObjectType *o_ptr = (*o_ptr_ptr);
+    auto *o_ptr = (*o_ptr_ptr);
 
     /* Cast off activated item */
     INVENTORY_IDX slot;
diff --git a/src/status/base-status.cpp b/src/status/base-status.cpp
index d8880a600..5828aba91 100644
--- a/src/status/base-status.cpp
+++ b/src/status/base-status.cpp
@@ -268,7 +268,7 @@ bool lose_all_info(PlayerType *player_ptr)
     chg_virtue(player_ptr, V_KNOWLEDGE, -5);
     chg_virtue(player_ptr, V_ENLIGHTEN, -5);
     for (int i = 0; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if ((o_ptr->k_idx == 0) || o_ptr->is_fully_known())
             continue;
 
diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index d6ea41bcb..1e0e8978f 100644
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -153,7 +153,7 @@ void do_cmd_store(PlayerType *player_ptr)
         handle_stuff(player_ptr);
         if (player_ptr->inventory_list[INVEN_PACK].k_idx) {
             INVENTORY_IDX item = INVEN_PACK;
-            ObjectType *o_ptr = &player_ptr->inventory_list[item];
+            auto *o_ptr = &player_ptr->inventory_list[item];
             if (cur_store_num != StoreSaleType::HOME) {
                 if (cur_store_num == StoreSaleType::MUSEUM)
                     msg_print(_("ザックからアイテムがあふれそうなので、あわてて博物館から出た...", "Your pack is so full that you flee the Museum..."));
diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index 9a18f4a42..6bca167b0 100644
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -101,7 +101,7 @@ static std::vector<PARAMETER_VALUE> store_same_magic_device_pvals(ObjectType *j_
 {
     auto list = std::vector<PARAMETER_VALUE>();
     for (INVENTORY_IDX i = 0; i < st_ptr->stock_num; i++) {
-        ObjectType *o_ptr = &st_ptr->stock[i];
+        auto *o_ptr = &st_ptr->stock[i];
         if (o_ptr == j_ptr)
             continue;
         if (o_ptr->k_idx != j_ptr->k_idx)
diff --git a/src/store/store.cpp b/src/store/store.cpp
index 760b7bed0..f7fc587ff 100644
--- a/src/store/store.cpp
+++ b/src/store/store.cpp
@@ -298,7 +298,7 @@ void store_maintenance(PlayerType *player_ptr, int town_num, StoreSaleType store
     st_ptr->insult_cur = 0;
     if (store_num == StoreSaleType::BLACK) {
         for (INVENTORY_IDX j = st_ptr->stock_num - 1; j >= 0; j--) {
-            ObjectType *o_ptr = &st_ptr->stock[j];
+            auto *o_ptr = &st_ptr->stock[j];
             if (black_market_crap(player_ptr, o_ptr)) {
                 store_item_increase(j, 0 - o_ptr->number);
                 store_item_optimize(j);
diff --git a/src/view/display-player-middle.cpp b/src/view/display-player-middle.cpp
index 2c804d07c..13980a068 100644
--- a/src/view/display-player-middle.cpp
+++ b/src/view/display-player-middle.cpp
@@ -37,7 +37,7 @@ static void display_player_melee_bonus(PlayerType *player_ptr, int hand, int han
 {
     HIT_PROB show_tohit = player_ptr->dis_to_h[hand];
     HIT_POINT show_todam = player_ptr->dis_to_d[hand];
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + hand];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + hand];
 
     if (o_ptr->is_known())
         show_tohit += o_ptr->to_h;
@@ -90,7 +90,7 @@ static void display_sub_hand(PlayerType *player_ptr)
  */
 static void display_hit_damage(PlayerType *player_ptr)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_BOW];
+    auto *o_ptr = &player_ptr->inventory_list[INVEN_BOW];
     HIT_PROB show_tohit = player_ptr->dis_to_h_b;
     HIT_POINT show_todam = 0;
     if (o_ptr->is_known())
diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index d648c92a1..e8f2577e5 100644
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -21,7 +21,7 @@
  */
 void inven_item_charges(PlayerType *player_ptr, INVENTORY_IDX item)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[item];
+    auto *o_ptr = &player_ptr->inventory_list[item];
     if ((o_ptr->tval != ItemKindType::STAFF) && (o_ptr->tval != ItemKindType::WAND))
         return;
     if (!o_ptr->is_known())
@@ -52,7 +52,7 @@ void inven_item_charges(PlayerType *player_ptr, INVENTORY_IDX item)
  */
 void inven_item_describe(PlayerType *player_ptr, INVENTORY_IDX item)
 {
-    ObjectType *o_ptr = &player_ptr->inventory_list[item];
+    auto *o_ptr = &player_ptr->inventory_list[item];
     GAME_TEXT o_name[MAX_NLEN];
     describe_flavor(player_ptr, o_name, o_ptr, 0);
 #ifdef JP
diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index 4cd67a1e9..6e6af9ab3 100644
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -223,7 +223,7 @@ void wiz_modify_item_activation(PlayerType *player_ptr)
 void wiz_identify_full_inventory(PlayerType *player_ptr)
 {
     for (int i = 0; i < INVEN_TOTAL; i++) {
-        ObjectType *o_ptr = &player_ptr->inventory_list[i];
+        auto *o_ptr = &player_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
@@ -759,7 +759,7 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
     char buf[MAX_NLEN] = "\0";
     char *str = buf;
     ObjectType forge;
-    ObjectType *o_ptr = &forge;
+    auto *o_ptr = &forge;
     char o_name[MAX_NLEN];
 
     bool wish_art = false;