[Refactor] #1642 Separated copy_object() from execute()

diff --git a/src/object-use/quaff/quaff-execution.cpp b/src/object-use/quaff/quaff-execution.cpp
index db91071..568f212 100644 (file)
--- a/src/object-use/quaff/quaff-execution.cpp
+++ b/src/object-use/quaff/quaff-execution.cpp
@@ -17,6 +17,7 @@
 #include "main/sound-of-music.h"
 #include "mutation/mutation-investor-remover.h"
 #include "object-use/item-use-checker.h"
+#include "object-use/quaff/quaff-effects.h"
 #include "object/object-broken.h"
 #include "object/object-info.h"
 #include "object/object-kind.h"
@@ -85,16 +86,12 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
         (void)SpellHex(this->player_ptr).stop_all_spells();
     }
 
-    auto *tmp_o_ptr = ref_item(this->player_ptr, item);
-    ObjectType forge;
-    auto *o_ptr = &forge;
-    o_ptr->copy_from(tmp_o_ptr);
-    o_ptr->number = 1;
+    const auto &o_ref = this->copy_object(item);
     vary_item(this->player_ptr, item, -1);
     sound(SOUND_QUAFF);
     auto ident = false;
-    if (o_ptr->tval == ItemKindType::POTION) {
-        switch (o_ptr->sval) {
+    if (o_ref.tval == ItemKindType::POTION) {
+        switch (o_ref.sval) {
         case SV_POTION_WATER:
             msg_print(_("口の中がさっぱりした。", "That was refreshing."));
             msg_print(_("のどの渇きが少しおさまった。", "You feel less thirsty."));
@@ -273,7 +270,7 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
             }
 
             if (set_fast(this->player_ptr, randint1(25) + 15, false)) {
-                    ident = true;
+                ident = true;
             }
 
             break;
@@ -537,20 +534,20 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
 
     if (PlayerRace(this->player_ptr).equals(PlayerRaceType::SKELETON)) {
         msg_print(_("液体の一部はあなたのアゴを素通りして落ちた！", "Some of the fluid falls through your jaws!"));
-        (void)potion_smash_effect(this->player_ptr, 0, this->player_ptr->y, this->player_ptr->x, o_ptr->k_idx);
+        (void)potion_smash_effect(this->player_ptr, 0, this->player_ptr->y, this->player_ptr->x, o_ref.k_idx);
     }
 
     this->player_ptr->update |= PU_COMBINE | PU_REORDER;
-    if (!o_ptr->is_aware()) {
+    if (!o_ref.is_aware()) {
         chg_virtue(this->player_ptr, V_PATIENCE, -1);
         chg_virtue(this->player_ptr, V_CHANCE, 1);
         chg_virtue(this->player_ptr, V_KNOWLEDGE, -1);
     }
 
-    object_tried(o_ptr);
-    if (ident && !o_ptr->is_aware()) {
-        object_aware(this->player_ptr, o_ptr);
-        gain_exp(this->player_ptr, (k_info[o_ptr->k_idx].level + (this->player_ptr->lev >> 1)) / this->player_ptr->lev);
+    object_tried(&o_ref);
+    if (ident && !o_ref.is_aware()) {
+        object_aware(this->player_ptr, &o_ref);
+        gain_exp(this->player_ptr, (k_info[o_ref.k_idx].level + (this->player_ptr->lev >> 1)) / this->player_ptr->lev);
     }
 
     this->player_ptr->window_flags |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
@@ -561,11 +558,11 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
     switch (PlayerRace(this->player_ptr).food()) {
     case PlayerRaceFoodType::WATER:
         msg_print(_("水分を取り込んだ。", "You are moistened."));
-        set_food(this->player_ptr, std::min<short>(this->player_ptr->food + o_ptr->pval + std::max<short>(0, o_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
+        set_food(this->player_ptr, std::min<short>(this->player_ptr->food + o_ref.pval + std::max<short>(0, o_ref.pval * 10) + 2000, PY_FOOD_MAX - 1));
         break;
     case PlayerRaceFoodType::OIL:
-        if (o_ptr->tval != ItemKindType::FLASK) {
-            set_food(this->player_ptr, this->player_ptr->food + ((o_ptr->pval) / 20));
+        if (o_ref.tval != ItemKindType::FLASK) {
+            set_food(this->player_ptr, this->player_ptr->food + ((o_ref.pval) / 20));
             break;
         }
 
@@ -573,14 +570,14 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
         set_food(this->player_ptr, this->player_ptr->food + 5000);
         break;
     case PlayerRaceFoodType::BLOOD:
-        (void)set_food(this->player_ptr, this->player_ptr->food + (o_ptr->pval / 10));
+        (void)set_food(this->player_ptr, this->player_ptr->food + (o_ref.pval / 10));
         break;
     case PlayerRaceFoodType::MANA:
     case PlayerRaceFoodType::CORPSE:
-        set_food(this->player_ptr, this->player_ptr->food + ((o_ptr->pval) / 20));
+        set_food(this->player_ptr, this->player_ptr->food + ((o_ref.pval) / 20));
         break;
     default:
-        (void)set_food(this->player_ptr, this->player_ptr->food + o_ptr->pval);
+        (void)set_food(this->player_ptr, this->player_ptr->food + o_ref.pval);
         break;
     }
 }
@@ -660,3 +657,11 @@ bool ObjectQuaffEntity::detonation()
     (void)bss.mod_cut(5000);
     return true;
 }
+
+ObjectType ObjectQuaffEntity::copy_object(const INVENTORY_IDX item)
+{
+    auto *tmp_o_ptr = ref_item(this->player_ptr, item);
+    auto o_val = *tmp_o_ptr;
+    o_val.number = 1;
+    return o_val;
+}

diff --git a/src/object-use/quaff/quaff-execution.h b/src/object-use/quaff/quaff-execution.h
index 79ae397..242e9c0 100644 (file)
--- a/src/object-use/quaff/quaff-execution.h
+++ b/src/object-use/quaff/quaff-execution.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 
+class ObjectType;
 class PlayerType;
 class ObjectQuaffEntity {
 public:
@@ -14,6 +15,7 @@ private:
     PlayerType *player_ptr;
 
     bool can_quaff();
+    ObjectType copy_object(const INVENTORY_IDX item);
     bool booze();
     bool detonation();
 };

diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp
index 85b7c3a..ab7a634 100644 (file)
--- a/src/perception/object-perception.cpp
+++ b/src/perception/object-perception.cpp
@@ -42,7 +42,7 @@ void object_known(ObjectType *o_ptr)
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param o_ptr ＊鑑定＊済にするオブジェクトの構造体参照ポインタ
  */
-void object_aware(PlayerType *player_ptr, ObjectType *o_ptr)
+void object_aware(PlayerType *player_ptr, const ObjectType *o_ptr)
 {
     const bool is_already_awared = o_ptr->is_aware();
 
@@ -86,7 +86,7 @@ void object_aware(PlayerType *player_ptr, ObjectType *o_ptr)
  * Something has been "sampled"
  * @param o_ptr 試行済にするオブジェクトの構造体参照ポインタ
  */
-void object_tried(ObjectType *o_ptr)
+void object_tried(const ObjectType *o_ptr)
 {
     k_info[o_ptr->k_idx].tried = true;
 }

diff --git a/src/perception/object-perception.h b/src/perception/object-perception.h
index b0c7f47..2ab86bc 100644 (file)
--- a/src/perception/object-perception.h
+++ b/src/perception/object-perception.h
@@ -3,5 +3,5 @@
 class ObjectType;
 class PlayerType;
 void object_known(ObjectType *o_ptr);
-void object_aware(PlayerType *player_ptr, ObjectType *o_ptr);
-void object_tried(ObjectType *o_ptr);
+void object_aware(PlayerType *player_ptr, const ObjectType *o_ptr);
+void object_tried(const ObjectType *o_ptr);

diff --git a/src/system/object-type-definition.cpp b/src/system/object-type-definition.cpp
index e96a267..75f49c8 100644 (file)
--- a/src/system/object-type-definition.cpp
+++ b/src/system/object-type-definition.cpp
@@ -44,7 +44,7 @@ void ObjectType::wipe()
  * Wipe an object clean.
  * @param j_ptr 複製元のオブジェクトの構造体参照ポインタ
  */
-void ObjectType::copy_from(ObjectType *j_ptr)
+void ObjectType::copy_from(const ObjectType *j_ptr)
 {
     *this = *j_ptr;
 }

diff --git a/src/system/object-type-definition.h b/src/system/object-type-definition.h
index 268ffb8..f38434e 100644 (file)
--- a/src/system/object-type-definition.h
+++ b/src/system/object-type-definition.h
@@ -68,7 +68,7 @@ public:
     int artifact_bias{}; /*!< ランダムアーティファクト生成時のバイアスID */
 
     void wipe();
-    void copy_from(ObjectType *j_ptr);
+    void copy_from(const ObjectType *j_ptr);
     void prep(KIND_OBJECT_IDX ko_idx);
     bool is_weapon() const;
     bool is_weapon_ammo() const;