Merge pull request #3212 from Hourier/Change-Signature-PathBuild-1

[hengbandforosx/hengbandosx.git] / src / perception / object-perception.cpp

diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp
index 6717aa3..436cc98 100644 (file)
--- a/src/perception/object-perception.cpp
+++ b/src/perception/object-perception.cpp
@@ -7,16 +7,14 @@
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/trg-types.h"
 #include "object/item-tester-hooker.h" // 暫定、このファイルへ引っ越す.
-#include "object/object-generator.h"
-#include "object/object-kind.h"
-#include "system/object-type-definition.h"
+#include "system/baseitem-info.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 
 /*!
  * @brief オブジェクトを鑑定済にする /
  * Known is true when the "attributes" of an object are "known".
  * @param o_ptr 鑑定済にするオブジェクトの構造体参照ポインタ
- * @return なし
  * These include tohit, todam, toac, cost, and pval (charges).\n
  *\n
  * Note that "knowing" an object gives you everything that an "awareness"\n
@@ -30,7 +28,7 @@
  *\n
  * This routine also removes any inscriptions generated by "feelings".\n
  */
-void object_known(object_type *o_ptr)
+void object_known(ItemEntity *o_ptr)
 {
     o_ptr->feeling = FEEL_NONE;
     o_ptr->ident &= ~(IDENT_SENSE);
@@ -41,70 +39,49 @@ void object_known(object_type *o_ptr)
 /*!
  * @brief オブジェクトを＊鑑定＊済にする /
  * The player is now aware of the effects of the given object.
- * @param owner_ptr プレーヤーへの参照ポインタ
+ * @param player_ptr プレイヤーへの参照ポインタ
  * @param o_ptr ＊鑑定＊済にするオブジェクトの構造体参照ポインタ
- * @return なし
  */
-void object_aware(player_type *owner_ptr, object_type *o_ptr)
+void object_aware(PlayerType *player_ptr, const ItemEntity *o_ptr)
 {
-    const bool is_already_awared = object_is_aware(o_ptr);
+    const bool is_already_awared = o_ptr->is_aware();
 
-    k_info[o_ptr->k_idx].aware = TRUE;
+    baseitems_info[o_ptr->bi_id].aware = true;
 
     // 以下、playrecordに記録しない場合はreturnする
-    if (!record_ident)
+    if (!record_ident) {
         return;
+    }
 
-    if (is_already_awared || owner_ptr->is_dead)
+    if (is_already_awared || player_ptr->is_dead) {
         return;
+    }
 
     // アーティファクト専用ベースアイテムは記録しない
-    if (k_info[o_ptr->k_idx].gen_flags.has(TRG::INSTA_ART))
+    if (baseitems_info[o_ptr->bi_id].gen_flags.has(ItemGenerationTraitType::INSTA_ART)) {
         return;
+    }
 
-    // 未鑑定名の無いアイテムは記録しない
-    if (!((o_ptr->tval >= TV_AMULET && o_ptr->tval <= TV_POTION) || o_ptr->tval == TV_FOOD))
+    if (!o_ptr->has_unidentified_name()) {
         return;
+    }
 
     // playrecordに識別したアイテムを記録
-    object_type forge;
-    object_type *q_ptr;
-    GAME_TEXT o_name[MAX_NLEN];
-
+    ItemEntity forge;
+    ItemEntity *q_ptr;
     q_ptr = &forge;
-    object_copy(q_ptr, o_ptr);
-
+    q_ptr->copy_from(o_ptr);
     q_ptr->number = 1;
-    describe_flavor(owner_ptr, o_name, q_ptr, OD_NAME_ONLY);
-
-    exe_write_diary(owner_ptr, DIARY_FOUND, 0, o_name);
+    const auto item_name = describe_flavor(player_ptr, q_ptr, OD_NAME_ONLY);
+    exe_write_diary(player_ptr, DIARY_FOUND, 0, item_name.data());
 }
 
 /*!
  * @brief オブジェクトを試行済にする /
  * Something has been "sampled"
  * @param o_ptr 試行済にするオブジェクトの構造体参照ポインタ
- * @return なし
- */
-void object_tried(object_type *o_ptr) { k_info[o_ptr->k_idx].tried = TRUE; }
-
-/*
- * @brief 与えられたオブジェクトのベースアイテムが鑑定済かを返す / Determine if a given inventory item is "aware"
- * @param o_ptr オブジェクトへの参照ポインタ
- * @return 鑑定済ならTRUE
- */
-bool object_is_aware(object_type *o_ptr) { return k_info[(o_ptr)->k_idx].aware; }
-
-/*
- * Determine if a given inventory item is "tried"
- */
-bool object_is_tried(object_type *o_ptr) { return k_info[(o_ptr)->k_idx].tried; }
-
-/*
- * Determine if a given inventory item is "known"
- * Test One -- Check for special "known" tag
- * Test Two -- Check for "Easy Know" + "Aware"
  */
-bool object_is_known(object_type *o_ptr) { return ((o_ptr->ident & IDENT_KNOWN) != 0) || (k_info[(o_ptr)->k_idx].easy_know && k_info[(o_ptr)->k_idx].aware); }
-
-bool object_is_fully_known(object_type *o_ptr) { return (o_ptr->ident & IDENT_FULL_KNOWN) != 0; }
+void object_tried(const ItemEntity *o_ptr)
+{
+    baseitems_info[o_ptr->bi_id].tried = true;
+}