[Refactor] #2118 Separated add_dark_flag() from give_cursed()

diff --git a/src/object-enchant/others/apply-magic-lite.cpp b/src/object-enchant/others/apply-magic-lite.cpp
index 3c49325..8f896e4 100644 (file)
--- a/src/object-enchant/others/apply-magic-lite.cpp
+++ b/src/object-enchant/others/apply-magic-lite.cpp
@@ -45,10 +45,6 @@ void LiteEnchanter::apply_magic()
     }
 }
 
-void LiteEnchanter::enchant()
-{
-}
-
 void LiteEnchanter::give_ego_index()
 {
     while (true) {
@@ -71,30 +67,32 @@ void LiteEnchanter::give_ego_index()
     }
 }
 
-void LiteEnchanter::give_high_ego_index()
-{
-}
-
 void LiteEnchanter::give_cursed()
 {
     this->o_ptr->name2 = get_random_ego(INVEN_LITE, false);
     switch (this->o_ptr->name2) {
     case EGO_LITE_DARKNESS:
         this->o_ptr->xtra4 = 0;
-        switch (this->o_ptr->sval) {
-            case SV_LITE_TORCH:
-                this->o_ptr->art_flags.set(TR_LITE_M1);
-                return;
-            case SV_LITE_LANTERN:
-                this->o_ptr->art_flags.set(TR_LITE_M2);
-                return;
-            case SV_LITE_FEANOR:
-                this->o_ptr->art_flags.set(TR_LITE_M3);
-                return;
-            default:
-                return;
-        }
+        this->add_dark_flag();
+        return;
+    default:
+        return;
+    }
+}
 
+void LiteEnchanter::add_dark_flag()
+{
+    switch (this->o_ptr->sval) {
+    case SV_LITE_TORCH:
+        this->o_ptr->art_flags.set(TR_LITE_M1);
+        return;
+    case SV_LITE_LANTERN:
+        this->o_ptr->art_flags.set(TR_LITE_M2);
+        return;
+    case SV_LITE_FEANOR:
+        this->o_ptr->art_flags.set(TR_LITE_M3);
+        return;
+    default:
         return;
     }
 }

diff --git a/src/object-enchant/others/apply-magic-lite.h b/src/object-enchant/others/apply-magic-lite.h
index 11267ca..038d482 100644 (file)
--- a/src/object-enchant/others/apply-magic-lite.h
+++ b/src/object-enchant/others/apply-magic-lite.h
@@ -11,9 +11,9 @@ public:
     void apply_magic() override;
 
 protected:
-    void enchant() override;
+    void enchant() override{};
     void give_ego_index() override;
-    void give_high_ego_index() override;
+    void give_high_ego_index() override{};
     void give_cursed() override;
 
 private:
@@ -21,4 +21,6 @@ private:
     ObjectType *o_ptr;
     DEPTH level;
     int power;
+
+    void add_dark_flag();
 };