[Refactor] #1469 Adjusted arguments of gain_exp_expert() and gain_exp_master()

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index b5324c5..fe08c38 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -224,7 +224,6 @@ void RealmHex::gain_exp_from_hex()
             continue;
         }
 
-        const auto *s_ptr = &technic_info[REALM_HEX - MIN_TECHNIC][spell];
         if (this->caster_ptr->spell_exp[spell] < SPELL_EXP_BEGINNER) {
             this->caster_ptr->spell_exp[spell] += 5;
             continue;
@@ -234,11 +233,11 @@ void RealmHex::gain_exp_from_hex()
             continue;
         }
 
-        if (this->gain_exp_expert(spell, s_ptr)) {
+        if (this->gain_exp_expert(spell)) {
             continue;
         }
 
-        this->gain_exp_master(spell, s_ptr);
+        this->gain_exp_master(spell);
     }
 }
 
@@ -259,12 +258,13 @@ bool RealmHex::gain_exp_skilled(const int spell)
     return true;
 }
 
-bool RealmHex::gain_exp_expert(const int spell, const magic_type *s_ptr)
+bool RealmHex::gain_exp_expert(const int spell)
 {
     if (this->caster_ptr->spell_exp[spell] >= SPELL_EXP_EXPERT) {
         return false;
     }
 
+    const auto *s_ptr = &technic_info[REALM_HEX - MIN_TECHNIC][spell];
     auto *floor_ptr = this->caster_ptr->current_floor_ptr;
     auto gain_condition = one_in_(5);
     gain_condition &= (floor_ptr->dun_level + 5) > this->caster_ptr->lev;
@@ -276,12 +276,13 @@ bool RealmHex::gain_exp_expert(const int spell, const magic_type *s_ptr)
     return true;
 }
 
-void RealmHex::gain_exp_master(const int spell, const magic_type *s_ptr)
+void RealmHex::gain_exp_master(const int spell)
 {
     if (this->caster_ptr->spell_exp[spell] >= SPELL_EXP_MASTER) {
         return;
     }
 
+    const auto *s_ptr = &technic_info[REALM_HEX - MIN_TECHNIC][spell];
     auto *floor_ptr = this->caster_ptr->current_floor_ptr;
     auto gain_condition = one_in_(5);
     gain_condition &= (floor_ptr->dun_level + 5) > this->caster_ptr->lev;

diff --git a/src/spell-realm/spells-hex.h b/src/spell-realm/spells-hex.h
index 4017609..cc7b118 100644 (file)
--- a/src/spell-realm/spells-hex.h
+++ b/src/spell-realm/spells-hex.h
@@ -2,7 +2,6 @@
 
 #include "system/angband.h"
 
-struct magic_type;
 struct player_type;
 class RealmHex {
 public:
@@ -22,8 +21,8 @@ private:
     int calc_need_mana();
     void gain_exp_from_hex();
     bool gain_exp_skilled(const int spell);
-    bool gain_exp_expert(const int spell, const magic_type *s_ptr);
-    void gain_exp_master(const int spell, const magic_type *s_ptr);
+    bool gain_exp_expert(const int spell);
+    void gain_exp_master(const int spell);
 };
 
 bool stop_hex_spell_all(player_type *caster_ptr);