[Refactor] #1389 Changed monap_type from struct to class MonsterAttackPlayer

[hengbandforosx/hengbandosx.git] / src / monster-attack / monster-attack-util.cpp

diff --git a/src/monster-attack/monster-attack-util.cpp b/src/monster-attack/monster-attack-util.cpp
index ea014bf..3bb1e18 100644 (file)
--- a/src/monster-attack/monster-attack-util.cpp
+++ b/src/monster-attack/monster-attack-util.cpp
@@ -1,5 +1,5 @@
 /*!
- * @brief ã\83¢ã\83³ã\82¹ã\82¿ã\83¼ã\81\8cã\83\97ã\83¬ã\83¼ヤーへ攻撃する処理に関するユーティリティ
+ * @brief ã\83¢ã\83³ã\82¹ã\82¿ã\83¼ã\81\8cã\83\97ã\83¬ã\82¤ヤーへ攻撃する処理に関するユーティリティ
  * @date 2020/05/30
  * @author Hourier
  */
@@ -9,18 +9,18 @@
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
-monap_type *initialize_monap_type(player_type *target_ptr, monap_type *monap_ptr, MONSTER_IDX m_idx)
+MonsterAttackPlayer *initialize_MonsterAttackPlayer(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr, MONSTER_IDX m_idx)
 {
 #ifdef JP
     monap_ptr->abbreviate = 0;
 #endif
     monap_ptr->m_idx = m_idx;
-    floor_type *floor_ptr = target_ptr->current_floor_ptr;
+    floor_type *floor_ptr = player_ptr->current_floor_ptr;
     monap_ptr->m_ptr = &floor_ptr->m_list[m_idx];
     monap_ptr->act = nullptr;
     monap_ptr->touched = false;
     monap_ptr->explode = false;
-    monap_ptr->do_silly_attack = one_in_(2) && target_ptr->image;
+    monap_ptr->do_silly_attack = one_in_(2) && player_ptr->hallucinated;
     monap_ptr->obvious = false;
     monap_ptr->get_damage = 0;
     monap_ptr->alive = true;