[Refactor] 再定義したものへ置き換え

[hengbandforosx/hengbandosx.git] / src / lore / lore-util.cpp

diff --git a/src/lore/lore-util.cpp b/src/lore/lore-util.cpp
index a4e6a3e..a2be20c 100644 (file)
--- a/src/lore/lore-util.cpp
+++ b/src/lore/lore-util.cpp
@@ -1,6 +1,8 @@
 #include "lore/lore-util.h"
 #include "game-option/birth-options.h"
+#include "monster-attack/monster-attack-types.h"
 #include "monster-race/monster-race.h"
+#include "system/monster-race-definition.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 
@@ -31,7 +33,7 @@ lore_type *initialize_lore_type(lore_type *lore_ptr, MONRACE_IDX r_idx, monster_
 {
 #ifdef JP
 #else
-    lore_ptr->sin = FALSE;
+    lore_ptr->sin = false;
 #endif
     lore_ptr->r_idx = r_idx;
     lore_ptr->nightmare = ironman_nightmare && (mode != MONSTER_LORE_DEBUG);
@@ -42,15 +44,15 @@ lore_type *initialize_lore_type(lore_type *lore_ptr, MONRACE_IDX r_idx, monster_
     lore_ptr->flags1 = (lore_ptr->r_ptr->flags1 & lore_ptr->r_ptr->r_flags1);
     lore_ptr->flags2 = (lore_ptr->r_ptr->flags2 & lore_ptr->r_ptr->r_flags2);
     lore_ptr->flags3 = (lore_ptr->r_ptr->flags3 & lore_ptr->r_ptr->r_flags3);
-    lore_ptr->flags4 = (lore_ptr->r_ptr->flags4 & lore_ptr->r_ptr->r_flags4);
-    lore_ptr->a_ability_flags1 = (lore_ptr->r_ptr->a_ability_flags1 & lore_ptr->r_ptr->r_flags5);
-    lore_ptr->a_ability_flags2 = (lore_ptr->r_ptr->a_ability_flags2 & lore_ptr->r_ptr->r_flags6);
+    lore_ptr->ability_flags = (lore_ptr->r_ptr->ability_flags & lore_ptr->r_ptr->r_ability_flags);
+    lore_ptr->aura_flags = (lore_ptr->r_ptr->aura_flags & lore_ptr->r_ptr->r_aura_flags);
+    lore_ptr->behavior_flags = (lore_ptr->r_ptr->behavior_flags & lore_ptr->r_ptr->r_behavior_flags);
     lore_ptr->flags7 = (lore_ptr->r_ptr->flags7 & lore_ptr->r_ptr->flags7);
-    lore_ptr->flagsr = (lore_ptr->r_ptr->flagsr & lore_ptr->r_ptr->r_flagsr);
-    lore_ptr->reinforce = FALSE;
-    lore_ptr->know_everything = FALSE;
+    lore_ptr->resistance_flags = (lore_ptr->r_ptr->resistance_flags & lore_ptr->r_ptr->r_resistance_flags);
+    lore_ptr->reinforce = false;
+    lore_ptr->know_everything = false;
     lore_ptr->mode = mode;
-    lore_ptr->old = FALSE;
+    lore_ptr->old = false;
     lore_ptr->count = 0;
     return lore_ptr;
 }
@@ -58,6 +60,8 @@ lore_type *initialize_lore_type(lore_type *lore_ptr, MONRACE_IDX r_idx, monster_
 /*!
  * @brief モンスターの思い出メッセージをあらかじめ指定された関数ポインタに基づき出力する
  * @param str 出力文字列
- * @return なし
  */
-void hooked_roff(concptr str) { hook_c_roff(TERM_WHITE, str); }
+void hooked_roff(concptr str)
+{
+    hook_c_roff(TERM_WHITE, str);
+}