[Refactor] #38997 gain_exp() に player_type * 引数を追加．

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index bdafa0b..7a71294 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -584,7 +584,7 @@ static bool exe_open_chest(player_type *creature_ptr, POSITION y, POSITION x, OB
                if (randint0(100) < j)
                {
                        msg_print(_("鍵をはずした。", "You have picked the lock."));
-                       gain_exp(1);
+                       gain_exp(p_ptr, 1);
                        flag = TRUE;
                }
 
@@ -784,7 +784,7 @@ static bool do_cmd_open_aux(POSITION y, POSITION x)
                        sound(SOUND_OPENDOOR);
 
                        /* Experience */
-                       gain_exp(1);
+                       gain_exp(p_ptr, 1);
                }
 
                /* Failure */
@@ -1345,7 +1345,7 @@ bool easy_open_door(POSITION y, POSITION x)
                        sound(SOUND_OPENDOOR);
 
                        /* Experience */
-                       gain_exp(1);
+                       gain_exp(p_ptr, 1);
                }
 
                /* Failure */
@@ -1428,7 +1428,7 @@ static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
        else if (randint0(100) < j)
        {
                msg_print(_("箱に仕掛けられていたトラップを解除した。", "You have disarmed the chest."));
-               gain_exp(o_ptr->pval);
+               gain_exp(p_ptr, o_ptr->pval);
                o_ptr->pval = (0 - o_ptr->pval);
        }
 
@@ -1503,7 +1503,7 @@ bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir)
                msg_format(_("%sを解除した。", "You have disarmed the %s."), name);
                
                /* Reward */
-               gain_exp(power);
+               gain_exp(p_ptr, power);
 
                /* Remove the trap */
                cave_alter_feat(y, x, FF_DISARM);

diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index 0a8c53e..419e71b 100644 (file)
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -328,7 +328,7 @@ void exe_eat_food(INVENTORY_IDX item)
        if (ident && !object_is_aware(o_ptr))
        {
                object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+               gain_exp(p_ptr, (lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 2fb92fa..9ad4c4b 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -798,7 +798,7 @@ void do_cmd_destroy(void)
                        if (tester_exp<1) tester_exp = 1;
 
                        msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
-                       gain_exp(tester_exp * amt);
+                       gain_exp(p_ptr, tester_exp * amt);
                }
                if (item_tester_high_level_book(q_ptr) && q_ptr->tval == TV_LIFE_BOOK)
                {

diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index b634771..505bc80 100644 (file)
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -443,7 +443,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
                                EXP ee = (p_ptr->exp / 2) + 10;
                                if (ee > 100000L) ee = 100000L;
                                msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
-                               gain_exp(ee);
+                               gain_exp(p_ptr, ee);
                                ident = TRUE;
                        }
                        break;
@@ -533,7 +533,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
        if (ident && !object_is_aware(q_ptr))
        {
                object_aware(q_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+               gain_exp(p_ptr, (lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/cmd-read.c b/src/cmd-read.c
index 6948339..bebd676 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -581,7 +581,7 @@ void exe_read(INVENTORY_IDX item, bool known)
        if (ident && !object_is_aware(o_ptr))
        {
                object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+               gain_exp(p_ptr, (lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 1ed2c52..bd10624 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -1304,7 +1304,7 @@ void do_cmd_cast(void)
                        }
 
                        /* Gain experience */
-                       gain_exp(e * s_ptr->slevel);
+                       gain_exp(p_ptr, e * s_ptr->slevel);
 
                        /* Redraw object recall */
                        p_ptr->window |= (PW_OBJECT);

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 3157362..64a340a 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -374,7 +374,7 @@ void exe_use_staff(INVENTORY_IDX item)
        if (ident && !object_is_aware(o_ptr))
        {
                object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+               gain_exp(p_ptr, (lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index efb496c..b590d52 100644 (file)
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -388,7 +388,7 @@ void exe_zap_rod(INVENTORY_IDX item)
        if (ident && !object_is_aware(o_ptr))
        {
                object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+               gain_exp(p_ptr, (lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index ef5b510..b1cde68 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -428,7 +428,7 @@ void exe_aim_wand(INVENTORY_IDX item)
        if (ident && !object_is_aware(o_ptr))
        {
                object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+               gain_exp(p_ptr, (lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/mspells3.c b/src/mspells3.c
index cf030ec..d073040 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1786,7 +1786,7 @@ void learn_spell(int monspell)
        {
                p_ptr->magic_num2[monspell] = 1;
                msg_format(_("%sを学習した！", "You have learned %s!"), monster_powers[monspell].name);
-               gain_exp(monster_powers[monspell].level * monster_powers[monspell].smana);
+               gain_exp(p_ptr, monster_powers[monspell].level * monster_powers[monspell].smana);
 
                sound(SOUND_STUDY);
 

diff --git a/src/patron.c b/src/patron.c
index 02535ff..ce1772f 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -309,7 +309,7 @@ void gain_level_reward(int chosen_reward)
                                if (ee > 100000L) ee = 100000L;
                                msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
 
-                               gain_exp(ee);
+                               gain_exp(p_ptr, ee);
                                reward = _("経験値を得た", "experience");
                        }
                        break;

diff --git a/src/player-effects.c b/src/player-effects.c
index 8794227..79e42c5 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -3930,7 +3930,7 @@ void gain_exp_64(s32b amount, u32b amount_frac)
 /*
  * Gain experience
  */
-void gain_exp(s32b amount)
+void gain_exp(player_type *creature_ptr, s32b amount)
 {
        gain_exp_64(amount, 0L);
 }

diff --git a/src/player-effects.h b/src/player-effects.h
index 454c94b..a58cb33 100644 (file)
--- a/src/player-effects.h
+++ b/src/player-effects.h
@@ -67,7 +67,7 @@ extern bool do_inc_stat(player_type *creature_ptr, int stat);
 extern bool restore_level(player_type *creature_ptr);
 extern bool lose_all_info(player_type *creature_ptr);
 extern void gain_exp_64(s32b amount, u32b amount_frac);
-extern void gain_exp(s32b amount);
+extern void gain_exp(player_type *creature_ptr, s32b amount);
 extern void calc_android_exp(player_type *creature_ptr);
 extern void lose_exp(player_type *creature_ptr, s32b amount);
 extern bool drain_exp(player_type *creature_ptr, s32b drain, s32b slip, int hold_exp_prob);

diff --git a/src/spells2.c b/src/spells2.c
index 4f34b04..81c71e6 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3832,7 +3832,7 @@ void cast_shuffle(void)
                        s32b ee = (p_ptr->exp / 25) + 1;
                        if (ee > 5000) ee = 5000;
                        msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
-                       gain_exp(ee);
+                       gain_exp(p_ptr, ee);
                }
        }
 }

diff --git a/src/wizard2.c b/src/wizard2.c
index 3b03cf7..a49b63c 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1922,7 +1922,7 @@ void do_cmd_debug(void)
 
        /* Increase Experience */
        case 'x':
-               gain_exp(command_arg ? command_arg : (p_ptr->exp + 1));
+               gain_exp(p_ptr, command_arg ? command_arg : (p_ptr->exp + 1));
                break;
 
        /* Zap Monsters (Genocide) */