[Refactor] #2403 Separated strengthen() from apply_magic()

diff --git a/src/object-enchant/weapon/apply-magic-sword.cpp b/src/object-enchant/weapon/apply-magic-sword.cpp
index 4e61e05..14115e0 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-sword.cpp
+++ b/src/object-enchant/weapon/apply-magic-sword.cpp
@@ -40,24 +40,7 @@ void SwordEnchanter::apply_magic()
     }
 
     if (this->power > 1) {
-        if ((this->power > 2) || one_in_(40)) {
-            become_random_artifact(this->player_ptr, this->o_ptr, false);
-            return;
-        }
-
-        this->give_ego_index();
-        if (this->o_ptr->art_name > 0) {
-            return;
-        }
-
-        while (one_in_(10 * this->o_ptr->dd * this->o_ptr->ds)) {
-            this->o_ptr->dd++;
-        }
-
-        if (this->o_ptr->dd > 9) {
-            this->o_ptr->dd = 9;
-        }
-
+        this->strengthen();
         return;
     }
 
@@ -124,3 +107,24 @@ void SwordEnchanter::give_cursed()
         continue;
     }
 }
+
+void SwordEnchanter::strengthen()
+{
+    if ((this->power > 2) || one_in_(40)) {
+        become_random_artifact(this->player_ptr, this->o_ptr, false);
+        return;
+    }
+
+    this->give_ego_index();
+    if (this->o_ptr->art_name > 0) {
+        return;
+    }
+
+    while (one_in_(10 * this->o_ptr->dd * this->o_ptr->ds)) {
+        this->o_ptr->dd++;
+    }
+
+    if (this->o_ptr->dd > 9) {
+        this->o_ptr->dd = 9;
+    }
+}

diff --git a/src/object-enchant/weapon/apply-magic-sword.h b/src/object-enchant/weapon/apply-magic-sword.h
index 3e0b0a7..5d77fd2 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-sword.h
+++ b/src/object-enchant/weapon/apply-magic-sword.h
@@ -18,4 +18,6 @@ protected:
 
 private:
     PlayerType *player_ptr;
+
+    void strengthen();
 };