[Refactor] #2124 Removed inclusion of the header 'tval-types.h' from ObjectType

diff --git a/src/action/open-util.cpp b/src/action/open-util.cpp
index e89b247..297f8c8 100644 (file)
--- a/src/action/open-util.cpp
+++ b/src/action/open-util.cpp
@@ -6,6 +6,7 @@
 #include "action/open-util.h"
 #include "floor/geometry.h"
 #include "grid/trap.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
@@ -25,9 +26,8 @@ OBJECT_IDX chest_check(floor_type *floor_ptr, POSITION y, POSITION x, bool trapp
     for (const auto this_o_idx : g_ptr->o_idx_list) {
         ObjectType *o_ptr;
         o_ptr = &floor_ptr->o_list[this_o_idx];
-        if ((o_ptr->tval == ItemKindType::CHEST)
-            && (((!trapped) && (o_ptr->pval)) || /* non empty */
-                ((trapped) && (o_ptr->pval > 0)))) /* trapped only */
+        if ((o_ptr->tval == ItemKindType::CHEST) && (((!trapped) && (o_ptr->pval)) || /* non empty */
+                                                        ((trapped) && (o_ptr->pval > 0)))) /* trapped only */
             return this_o_idx;
     }
 

diff --git a/src/artifact/random-art-misc.cpp b/src/artifact/random-art-misc.cpp
index 7749e0c..488be0e 100644 (file)
--- a/src/artifact/random-art-misc.cpp
+++ b/src/artifact/random-art-misc.cpp
@@ -7,6 +7,7 @@
 #include "artifact/random-art-bias-types.h"
 #include "object-enchant/tr-types.h"
 #include "object-hook/hook-armor.h"
+#include "object/tval-types.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/bit-flags-calculator.h"
@@ -83,7 +84,7 @@ static bool invest_misc_chaos(ObjectType *o_ptr)
     return one_in_(2);
 }
 
-static bool invest_misc_res_curse(ObjectType* o_ptr)
+static bool invest_misc_res_curse(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_RES_CURSE))
         return false;
@@ -131,8 +132,7 @@ static void invest_misc_hit_dice(ObjectType *o_ptr)
     o_ptr->art_flags.set(TR_SHOW_MODS);
     HIT_PROB bonus_h = 4 + (HIT_PROB)randint1(11);
     HIT_POINT bonus_d = 4 + (HIT_POINT)randint1(11);
-    if ((o_ptr->tval != ItemKindType::SWORD) && (o_ptr->tval != ItemKindType::POLEARM) && (o_ptr->tval != ItemKindType::HAFTED) && (o_ptr->tval != ItemKindType::DIGGING) && (o_ptr->tval != ItemKindType::GLOVES)
-        && (o_ptr->tval != ItemKindType::RING)) {
+    if ((o_ptr->tval != ItemKindType::SWORD) && (o_ptr->tval != ItemKindType::POLEARM) && (o_ptr->tval != ItemKindType::HAFTED) && (o_ptr->tval != ItemKindType::DIGGING) && (o_ptr->tval != ItemKindType::GLOVES) && (o_ptr->tval != ItemKindType::RING)) {
         bonus_h /= 2;
         bonus_d /= 2;
     }

diff --git a/src/artifact/random-art-pval-investor.cpp b/src/artifact/random-art-pval-investor.cpp
index 53f1ae4..566690a 100644 (file)
--- a/src/artifact/random-art-pval-investor.cpp
+++ b/src/artifact/random-art-pval-investor.cpp
@@ -9,6 +9,7 @@
 #include "artifact/random-art-bias-types.h"
 #include "object-enchant/tr-types.h"
 #include "object-hook/hook-weapon.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-armor-types.h"
 #include "system/object-type-definition.h"
 #include "util/bit-flags-calculator.h"
@@ -125,8 +126,7 @@ static bool switch_random_art_bias(ObjectType *o_ptr)
 
 static bool random_art_bias_decrease_mana(ObjectType *o_ptr)
 {
-    if (((o_ptr->artifact_bias != BIAS_MAGE) && (o_ptr->artifact_bias != BIAS_PRIESTLY)) || (o_ptr->tval != ItemKindType::SOFT_ARMOR) || (o_ptr->sval != SV_ROBE)
-        || o_ptr->art_flags.has(TR_DEC_MANA) || !one_in_(3))
+    if (((o_ptr->artifact_bias != BIAS_MAGE) && (o_ptr->artifact_bias != BIAS_PRIESTLY)) || (o_ptr->tval != ItemKindType::SOFT_ARMOR) || (o_ptr->sval != SV_ROBE) || o_ptr->art_flags.has(TR_DEC_MANA) || !one_in_(3))
         return false;
 
     o_ptr->art_flags.set(TR_DEC_MANA);

diff --git a/src/artifact/random-art-resistance.cpp b/src/artifact/random-art-resistance.cpp
index d41ee77..062a894 100644 (file)
--- a/src/artifact/random-art-resistance.cpp
+++ b/src/artifact/random-art-resistance.cpp
@@ -6,6 +6,7 @@
 #include "artifact/random-art-resistance.h"
 #include "artifact/random-art-bias-types.h"
 #include "object-enchant/tr-types.h"
+#include "object/tval-types.h"
 #include "system/object-type-definition.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/artifact/random-art-slay.cpp b/src/artifact/random-art-slay.cpp
index 4e5e0a9..17ecbc5 100644 (file)
--- a/src/artifact/random-art-slay.cpp
+++ b/src/artifact/random-art-slay.cpp
@@ -6,6 +6,7 @@
 #include "artifact/random-art-slay.h"
 #include "artifact/random-art-bias-types.h"
 #include "object-enchant/tr-types.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/object-type-definition.h"
 #include "util/bit-flags-calculator.h"
@@ -165,8 +166,7 @@ static bool switch_random_art_slay(ObjectType *o_ptr)
     case BIAS_RANGER:
         return random_art_slay_animal(o_ptr);
     case BIAS_ROGUE:
-        if ((((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_DAGGER)) || ((o_ptr->tval == ItemKindType::POLEARM) && (o_ptr->sval == SV_SPEAR)))
-            && o_ptr->art_flags.has_not(TR_THROW)) {
+        if ((((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_DAGGER)) || ((o_ptr->tval == ItemKindType::POLEARM) && (o_ptr->sval == SV_SPEAR))) && o_ptr->art_flags.has_not(TR_THROW)) {
             o_ptr->art_flags.set(TR_THROW);
         }
 
@@ -222,7 +222,7 @@ void random_slay(ObjectType *o_ptr)
             o_ptr->artifact_bias = BIAS_LAW;
             break;
         }
-        
+
         if ((o_ptr->artifact_bias == BIAS_NONE) && one_in_(9))
             o_ptr->artifact_bias = BIAS_PRIESTLY;
 
@@ -330,12 +330,12 @@ void random_slay(ObjectType *o_ptr)
             o_ptr->artifact_bias = BIAS_POIS;
             break;
         }
-        
+
         if ((o_ptr->artifact_bias == BIAS_NONE) && one_in_(6)) {
             o_ptr->artifact_bias = BIAS_NECROMANTIC;
             break;
         }
-        
+
         if (o_ptr->artifact_bias == BIAS_NONE)
             o_ptr->artifact_bias = BIAS_ROGUE;
 

diff --git a/src/autopick/autopick-destroyer.cpp b/src/autopick/autopick-destroyer.cpp
index ae8f457..9731594 100644 (file)
--- a/src/autopick/autopick-destroyer.cpp
+++ b/src/autopick/autopick-destroyer.cpp
@@ -20,6 +20,7 @@
 #include "object-hook/hook-weapon.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player-base/player-class.h"
 #include "player-info/race-types.h"
@@ -54,7 +55,7 @@ static bool is_leave_special_item(PlayerType *player_ptr, ObjectType *o_ptr)
             return false;
     } else if (pc.is_tamer()) {
         if (o_ptr->tval == ItemKindType::WAND && o_ptr->sval == SV_WAND_HEAL_MONSTER && o_ptr->is_aware())
-             return false;
+            return false;
     }
 
     return true;

diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index 5100cd5..26bddc0 100644 (file)
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -12,6 +12,7 @@
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/input-key-requester.h"
+#include "object/tval-types.h"
 #include "player-base/player-class.h"
 #include "player-info/samurai-data-type.h"
 #include "player-status/player-energy.h"
@@ -295,7 +296,6 @@ void do_cmd_bash(PlayerType *player_ptr)
         disturb(player_ptr, false, false);
 }
 
-
 /*!
  * @brief 「くさびを打つ」ために必要なオブジェクトを所持しているかどうかの判定を返す /
  * Find the index of some "spikes", if possible.

diff --git a/src/combat/attack-accuracy.cpp b/src/combat/attack-accuracy.cpp
index e0f0392..b30cf84 100644 (file)
--- a/src/combat/attack-accuracy.cpp
+++ b/src/combat/attack-accuracy.cpp
@@ -5,6 +5,7 @@
 #include "main/sound-of-music.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
+#include "object/tval-types.h"
 #include "player-attack/player-attack-util.h"
 #include "player-base/player-class.h"
 #include "player/attack-defense-types.h"

diff --git a/src/combat/attack-criticality.cpp b/src/combat/attack-criticality.cpp
index 249c2b8..b990057 100644 (file)
--- a/src/combat/attack-criticality.cpp
+++ b/src/combat/attack-criticality.cpp
@@ -5,6 +5,7 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
+#include "object/tval-types.h"
 #include "player-attack/player-attack-util.h"
 #include "player-base/player-class.h"
 #include "player-info/equipment-info.h"
@@ -87,7 +88,8 @@ static void ninja_critical(PlayerType *player_ptr, player_attack_type *pa_ptr)
 {
     monster_race *r_ptr = &r_info[pa_ptr->m_ptr->r_idx];
     int maxhp = pa_ptr->m_ptr->maxhp;
-    if (one_in_(pa_ptr->backstab ? 13 : (pa_ptr->stab_fleeing || pa_ptr->surprise_attack) ? 15 : 27)) {
+    if (one_in_(pa_ptr->backstab ? 13 : (pa_ptr->stab_fleeing || pa_ptr->surprise_attack) ? 15
+                                                                                          : 27)) {
         pa_ptr->attack_damage *= 5;
         pa_ptr->drain_result *= 2;
         msg_format(_("刃が%sに深々と突き刺さった！", "You critically injured %s!"), pa_ptr->m_name);
@@ -96,8 +98,7 @@ static void ninja_critical(PlayerType *player_ptr, player_attack_type *pa_ptr)
 
     bool is_weaken = pa_ptr->m_ptr->hp < maxhp / 2;
     bool is_unique = ((r_ptr->flags1 & RF1_UNIQUE) != 0) || ((r_ptr->flags7 & RF7_UNIQUE2) != 0);
-    bool is_critical = (is_weaken && one_in_((player_ptr->num_blow[0] + player_ptr->num_blow[1] + 1) * 10))
-        || ((one_in_(666) || ((pa_ptr->backstab || pa_ptr->surprise_attack) && one_in_(11))) && !is_unique);
+    bool is_critical = (is_weaken && one_in_((player_ptr->num_blow[0] + player_ptr->num_blow[1] + 1) * 10)) || ((one_in_(666) || ((pa_ptr->backstab || pa_ptr->surprise_attack) && one_in_(11))) && !is_unique);
     if (!is_critical)
         return;
 
@@ -130,8 +131,7 @@ void critical_attack(PlayerType *player_ptr, player_attack_type *pa_ptr)
         return;
     }
 
-    bool is_ninja_hit = PlayerClass(player_ptr).equals(PlayerClassType::NINJA) && has_melee_weapon(player_ptr, INVEN_MAIN_HAND + pa_ptr->hand)
-        && !player_ptr->is_icky_wield[pa_ptr->hand] && ((player_ptr->cur_lite <= 0) || one_in_(7));
+    bool is_ninja_hit = PlayerClass(player_ptr).equals(PlayerClassType::NINJA) && has_melee_weapon(player_ptr, INVEN_MAIN_HAND + pa_ptr->hand) && !player_ptr->is_icky_wield[pa_ptr->hand] && ((player_ptr->cur_lite <= 0) || one_in_(7));
     if (is_ninja_hit)
         ninja_critical(player_ptr, pa_ptr);
 }

diff --git a/src/combat/slaying.cpp b/src/combat/slaying.cpp
index c0bc061..e34a92c 100644 (file)
--- a/src/combat/slaying.cpp
+++ b/src/combat/slaying.cpp
@@ -1,6 +1,7 @@
 #include "combat/slaying.h"
 #include "artifact/fixed-art-types.h"
 #include "core/player-redraw-types.h"
+#include "effect/attribute-types.h"
 #include "mind/mind-samurai.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
@@ -10,12 +11,12 @@
 #include "monster/monster-info.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "player-base/player-class.h"
 #include "player/attack-defense-types.h"
 #include "realm/realm-hex-numbers.h"
 #include "specific-object/torch.h"
 #include "spell-realm/spells-hex.h"
-#include "effect/attribute-types.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/object-type-definition.h"
@@ -250,7 +251,7 @@ AttributeFlags melee_attribute(PlayerType *player_ptr, ObjectType *o_ptr, combat
 
     if (SpellHex(player_ptr).is_spelling_specific(HEX_RUNESWORD))
         flgs.set(TR_SLAY_GOOD);
-    
+
     static const struct brand_convert_table_t {
         tr_type brand_type;
         AttributeType attribute;
@@ -273,7 +274,6 @@ AttributeFlags melee_attribute(PlayerType *player_ptr, ObjectType *o_ptr, combat
             attribute_flags.set(p->attribute);
     }
 
-    
     if ((flgs.has(TR_FORCE_WEAPON)) && (player_ptr->csp > (o_ptr->dd * o_ptr->ds / 5))) {
         attribute_flags.set(AttributeType::MANA);
     }

diff --git a/src/flavor/named-item-describer.cpp b/src/flavor/named-item-describer.cpp
index 39cfa71..c8ffd5a 100644 (file)
--- a/src/flavor/named-item-describer.cpp
+++ b/src/flavor/named-item-describer.cpp
@@ -20,6 +20,7 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "system/monster-race-definition.h"
+#include "object/tval-types.h"
 #endif
 
 static void check_object_known_aware(flavor_type *flavor_ptr)

diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index 03a4f1b..3efa2a0 100644 (file)
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -20,6 +20,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "pet/pet-util.h"
 #include "player-base/player-class.h"
 #include "player-base/player-race.h"

diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index 7c7c795..8e6c8fc 100644 (file)
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -25,6 +25,7 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
+#include "object/tval-types.h"
 #include "player-base/player-class.h"
 #include "player-info/sniper-data-type.h"
 #include "player-status/player-energy.h"

diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index 5d32ca3..05806c1 100644 (file)
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -3,6 +3,7 @@
 #include "core/disturbance.h"
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
+#include "effect/attribute-types.h"
 #include "floor/geometry.h"
 #include "grid/grid.h"
 #include "hpmp/hp-mp-processor.h"
@@ -17,6 +18,7 @@
 #include "mutation/mutation-flag-types.h"
 #include "mutation/mutation-investor-remover.h"
 #include "object/lite-processor.h"
+#include "object/tval-types.h"
 #include "player-info/equipment-info.h"
 #include "player/digestion-processor.h"
 #include "player/player-damage.h"
@@ -29,7 +31,6 @@
 #include "spell-kind/spells-world.h"
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"
-#include "effect/attribute-types.h"
 #include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "status/base-status.h"
@@ -59,8 +60,8 @@ static bool get_hack_dir(PlayerType *player_ptr, DIRECTION *dp)
     DIRECTION dir = 0;
     while (!dir) {
         concptr p = target_okay(player_ptr)
-            ? _("方向 ('5'でターゲットへ, '*'でターゲット再選択, ESCで中断)? ", "Direction ('5' for target, '*' to re-target, Escape to cancel)? ")
-            : _("方向 ('*'でターゲット選択, ESCで中断)? ", "Direction ('*' to choose a target, Escape to cancel)? ");
+                        ? _("方向 ('5'でターゲットへ, '*'でターゲット再選択, ESCで中断)? ", "Direction ('5' for target, '*' to re-target, Escape to cancel)? ")
+                        : _("方向 ('*'でターゲット選択, ESCで中断)? ", "Direction ('*' to choose a target, Escape to cancel)? ");
         if (!get_com(p, &command, true))
             break;
 

diff --git a/src/object-activation/activation-breath.cpp b/src/object-activation/activation-breath.cpp
index 2ae2dc1..4b301de 100644 (file)
--- a/src/object-activation/activation-breath.cpp
+++ b/src/object-activation/activation-breath.cpp
@@ -1,11 +1,12 @@
 #include "object-activation/activation-breath.h"
+#include "effect/attribute-types.h"
 #include "object-enchant/dragon-breaths-table.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "player/player-status.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"
-#include "effect/attribute-types.h"
 #include "status/element-resistance.h"
 #include "sv-definition/sv-ring-types.h"
 #include "system/object-type-definition.h"

diff --git a/src/object-enchant/object-ego.cpp b/src/object-enchant/object-ego.cpp
index 89989de..ea8dba6 100644 (file)
--- a/src/object-enchant/object-ego.cpp
+++ b/src/object-enchant/object-ego.cpp
@@ -11,6 +11,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/trc-types.h"
 #include "object-hook/hook-weapon.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/object-type-definition.h"
@@ -136,7 +137,7 @@ static void ego_invest_extra_abilities(ObjectType *o_ptr, EnumClassFlagGroup<Ite
  */
 static void ego_interpret_extra_abilities(ObjectType *o_ptr, ego_item_type *e_ptr, EnumClassFlagGroup<ItemGenerationTraitType> &gen_flags)
 {
-    for (auto& xtra : e_ptr->xtra_flags) {
+    for (auto &xtra : e_ptr->xtra_flags) {
         if (xtra.mul == 0 || xtra.dev == 0)
             continue;
 

diff --git a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
index 9402f2a..794a8a1 100644 (file)
--- a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
+++ b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
@@ -1,8 +1,9 @@
 #include "object-enchant/weapon/abstract-weapon-enchanter.h"
 #include "object-enchant/object-boost.h"
+#include "object/tval-types.h"
 #include "system/object-type-definition.h"
 
-AbstractWeaponEnchanter::AbstractWeaponEnchanter(ObjectType* o_ptr, DEPTH level, int power)
+AbstractWeaponEnchanter::AbstractWeaponEnchanter(ObjectType *o_ptr, DEPTH level, int power)
     : o_ptr(o_ptr)
     , level(level)
     , power(power)
@@ -27,7 +28,7 @@ AbstractWeaponEnchanter::AbstractWeaponEnchanter(ObjectType* o_ptr, DEPTH level,
 
         return;
     }
-    
+
     if (this->power < 0) {
         this->o_ptr->to_h -= tohit1;
         this->o_ptr->to_d -= todam1;

diff --git a/src/object-enchant/weapon/apply-magic-weapon.cpp b/src/object-enchant/weapon/apply-magic-weapon.cpp
index 8318aae..0d7d235 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-weapon.cpp
+++ b/src/object-enchant/weapon/apply-magic-weapon.cpp
@@ -11,6 +11,7 @@
 #include "object-enchant/object-ego.h"
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/floor-type-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/object-hook/hook-weapon.cpp b/src/object-hook/hook-weapon.cpp
index 0af1b00..85d7686 100644 (file)
--- a/src/object-hook/hook-weapon.cpp
+++ b/src/object-hook/hook-weapon.cpp
@@ -2,6 +2,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-hook/hook-armor.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "player/player-skill.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/object-type-definition.h"

diff --git a/src/object/lite-processor.cpp b/src/object/lite-processor.cpp
index 3037614..f3d176d 100644 (file)
--- a/src/object/lite-processor.cpp
+++ b/src/object/lite-processor.cpp
@@ -5,6 +5,7 @@
 #include "game-option/disturbance-options.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-ego.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-lite-types.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
@@ -15,9 +16,9 @@
  * @brief 10ゲームターンが進行する毎に光源の寿命を減らす処理
  * / Handle burning fuel every 10 game turns
  */
-void reduce_lite_life(PlayerType* player_ptr)
+void reduce_lite_life(PlayerType *player_ptr)
 {
-    ObjectType* o_ptr = &player_ptr->inventory_list[INVEN_LITE];
+    ObjectType *o_ptr = &player_ptr->inventory_list[INVEN_LITE];
     if (o_ptr->tval != ItemKindType::LITE)
         return;
 
@@ -38,7 +39,7 @@ void reduce_lite_life(PlayerType* player_ptr)
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param o_ptr 現在光源として使っているオブジェクトの構造体参照ポインタ
  */
-void notice_lite_change(PlayerType* player_ptr, ObjectType* o_ptr)
+void notice_lite_change(PlayerType *player_ptr, ObjectType *o_ptr)
 {
     if ((o_ptr->xtra4 < 100) || (!(o_ptr->xtra4 % 100))) {
         player_ptr->window_flags |= (PW_EQUIP);
@@ -53,8 +54,7 @@ void notice_lite_change(PlayerType* player_ptr, ObjectType* o_ptr)
         player_ptr->update |= (PU_TORCH);
         player_ptr->update |= (PU_BONUS);
     } else if (o_ptr->name2 == EGO_LITE_LONG) {
-        if ((o_ptr->xtra4 < 50) && (!(o_ptr->xtra4 % 5))
-            && (w_ptr->game_turn % (TURNS_PER_TICK * 2))) {
+        if ((o_ptr->xtra4 < 50) && (!(o_ptr->xtra4 % 5)) && (w_ptr->game_turn % (TURNS_PER_TICK * 2))) {
             if (disturb_minor)
                 disturb(player_ptr, false, true);
             msg_print(_("明かりが微かになってきている。", "Your light is growing faint."));

diff --git a/src/player-info/equipment-info.cpp b/src/player-info/equipment-info.cpp
index 9585b91..6ba26cb 100644 (file)
--- a/src/player-info/equipment-info.cpp
+++ b/src/player-info/equipment-info.cpp
@@ -1,6 +1,7 @@
 #include "player-info/equipment-info.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-hook/hook-weapon.h"
+#include "object/tval-types.h"
 #include "pet/pet-util.h"
 #include "player-base/player-class.h"
 #include "player-status/player-hand-types.h"

diff --git a/src/smith/smith-info.cpp b/src/smith/smith-info.cpp
index 7ab5ab8..a37b9d2 100644 (file)
--- a/src/smith/smith-info.cpp
+++ b/src/smith/smith-info.cpp
@@ -1,6 +1,7 @@
 #include "smith/smith-info.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "smith/smith-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/object-type-definition.h"

diff --git a/src/specific-object/monster-ball.cpp b/src/specific-object/monster-ball.cpp
index 9e8f97d..f29d7f3 100644 (file)
--- a/src/specific-object/monster-ball.cpp
+++ b/src/specific-object/monster-ball.cpp
@@ -1,4 +1,5 @@
 #include "specific-object/monster-ball.h"
+#include "effect/attribute-types.h"
 #include "effect/spells-effect-util.h"
 #include "floor/geometry.h"
 #include "game-option/input-options.h"
@@ -8,10 +9,10 @@
 #include "monster/monster-info.h"
 #include "monster/monster-util.h"
 #include "object-activation/activation-util.h"
+#include "object/tval-types.h"
 #include "pet/pet-util.h"
 #include "racial/racial-android.h"
 #include "spell-kind/spells-launcher.h"
-#include "effect/attribute-types.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"

diff --git a/src/specific-object/torch.cpp b/src/specific-object/torch.cpp
index b4995b7..767a0cf 100644 (file)
--- a/src/specific-object/torch.cpp
+++ b/src/specific-object/torch.cpp
@@ -9,6 +9,7 @@
 #include "object-enchant/object-ego.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "player/special-defense-types.h"
 #include "sv-definition/sv-lite-types.h"
 #include "system/floor-type-definition.h"

diff --git a/src/spell-realm/spells-arcane.cpp b/src/spell-realm/spells-arcane.cpp
index 5f91fea..6647b1a 100644 (file)
--- a/src/spell-realm/spells-arcane.cpp
+++ b/src/spell-realm/spells-arcane.cpp
@@ -1,6 +1,7 @@
 #include "spell-realm/spells-arcane.h"
 #include "core/player-update-types.h"
 #include "inventory/inventory-slot-types.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-lite-types.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/store/home.cpp b/src/store/home.cpp
index b1f3f9f..09665b9 100644 (file)
--- a/src/store/home.cpp
+++ b/src/store/home.cpp
@@ -5,6 +5,7 @@
 #include "game-option/game-play-options.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "store/store-util.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/store/service-checker.cpp b/src/store/service-checker.cpp
index fb3f759..d683483 100644 (file)
--- a/src/store/service-checker.cpp
+++ b/src/store/service-checker.cpp
@@ -4,6 +4,7 @@
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "store/store-util.h"
 #include "sv-definition/sv-potion-types.h"
 #include "sv-definition/sv-rod-types.h"
@@ -384,16 +385,16 @@ static byte decide_discount_rate(const PRICE cost)
 {
     if (cost < 5)
         return 0;
-    
+
     if (one_in_(25))
         return 25;
-    
+
     if (one_in_(150))
         return 50;
-    
+
     if (one_in_(300))
         return 75;
-    
+
     if (one_in_(500))
         return 90;
 

diff --git a/src/system/object-type-definition.h b/src/system/object-type-definition.h
index f410342..51cfd12 100644 (file)
--- a/src/system/object-type-definition.h
+++ b/src/system/object-type-definition.h
@@ -9,7 +9,6 @@
 
 #include "object-enchant/tr-flags.h"
 #include "object-enchant/trc-types.h"
-#include "object/tval-types.h"
 #include "system/angband.h"
 #include "system/system-variables.h"
 #include "util/flag-group.h"

diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp
index 56a47d0..2848ffc 100644 (file)
--- a/src/util/object-sort.cpp
+++ b/src/util/object-sort.cpp
@@ -7,6 +7,7 @@
 #include "util/object-sort.h"
 #include "monster-race/monster-race.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player/player-realm.h"
 #include "system/monster-race-definition.h"

diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index 01f9121..d648c92 100644 (file)
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -3,6 +3,7 @@
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "object-enchant/special-object-flags.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player-base/player-class.h"
 #include "realm/realm-names-table.h"

diff --git a/src/view/status-first-page.cpp b/src/view/status-first-page.cpp
index 2b6cbb3..b1a536f 100644 (file)
--- a/src/view/status-first-page.cpp
+++ b/src/view/status-first-page.cpp
@@ -16,6 +16,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player-base/player-class.h"
 #include "player-info/equipment-info.h"