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

diff --git a/src/object-use/quaff/quaff-execution.cpp b/src/object-use/quaff/quaff-execution.cpp
index e3efc8d..0237592 100644 (file)
--- a/src/object-use/quaff/quaff-execution.cpp
+++ b/src/object-use/quaff/quaff-execution.cpp
@@ -96,12 +96,7 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
     }
 
     this->player_ptr->update |= PU_COMBINE | PU_REORDER;
-    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);
-    }
-
+    this->change_virtue_as_quaff(o_ref);
     object_tried(&o_ref);
     if (ident && !o_ref.is_aware()) {
         object_aware(this->player_ptr, &o_ref);
@@ -167,3 +162,14 @@ void ObjectQuaffEntity::moisten(const ObjectType &o_ref)
         return;
     }
 }
+
+void ObjectQuaffEntity::change_virtue_as_quaff(const ObjectType &o_ref)
+{
+    if (o_ref.is_aware()) {
+        return;
+    }
+
+    chg_virtue(this->player_ptr, V_PATIENCE, -1);
+    chg_virtue(this->player_ptr, V_CHANCE, 1);
+    chg_virtue(this->player_ptr, V_KNOWLEDGE, -1);
+}

diff --git a/src/object-use/quaff/quaff-execution.h b/src/object-use/quaff/quaff-execution.h
index 1202d8f..82ff522 100644 (file)
--- a/src/object-use/quaff/quaff-execution.h
+++ b/src/object-use/quaff/quaff-execution.h
@@ -17,4 +17,5 @@ private:
     bool can_quaff();
     ObjectType copy_object(const INVENTORY_IDX item);
     void moisten(const ObjectType &o_ref);
+    void change_virtue_as_quaff(const ObjectType &o_ref);
 };