From 0226637add938b64bd2923115dc1d61a117e6c91 Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 10 Jun 2019 23:18:03 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38844=20new=5Fmane=20=E3=82=92=20p?= =?utf8?q?layer=5Ftype=20=E6=A7=8B=E9=80=A0=E4=BD=93=E3=81=AB=E7=A7=BB?= =?utf8?q?=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.c | 4 ++-- src/externs.h | 2 -- src/mspells1.c | 2 +- src/mspells2.c | 2 +- src/mspells3.c | 2 +- src/player-effects.c | 4 ++-- src/player-status.h | 1 + src/variable.c | 2 -- src/view-mainwindow.c | 4 ++-- 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/core.c b/src/core.c index 2fa002c68..87d106cb3 100644 --- a/src/core.c +++ b/src/core.c @@ -4866,12 +4866,12 @@ static void process_player(void) p_ptr->mane_dam[j] = p_ptr->mane_dam[j + 1]; } } - new_mane = FALSE; + p_ptr->new_mane = FALSE; p_ptr->redraw |= (PR_IMITATION); } if (p_ptr->action == ACTION_LEARN) { - new_mane = FALSE; + p_ptr->new_mane = FALSE; p_ptr->redraw |= (PR_STATE); } diff --git a/src/externs.h b/src/externs.h index 57fa5f615..0c422f56c 100644 --- a/src/externs.h +++ b/src/externs.h @@ -62,5 +62,3 @@ extern player_type *p_ptr; extern MONSTER_IDX pet_t_m_idx; extern MONSTER_IDX riding_t_m_idx; extern MONRACE_IDX today_mon; - -extern bool new_mane; diff --git a/src/mspells1.c b/src/mspells1.c index 6893b3b65..d59c82eec 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -1797,7 +1797,7 @@ bool make_attack_spell(MONSTER_IDX m_idx) p_ptr->mane_spell[p_ptr->mane_num] = thrown_spell - 96; p_ptr->mane_dam[p_ptr->mane_num] = dam; p_ptr->mane_num++; - new_mane = TRUE; + p_ptr->new_mane = TRUE; p_ptr->redraw |= (PR_IMITATION); } diff --git a/src/mspells2.c b/src/mspells2.c index 17fd6cd06..9967c8c42 100644 --- a/src/mspells2.c +++ b/src/mspells2.c @@ -731,7 +731,7 @@ bool monst_spell_monst(MONSTER_IDX m_idx) p_ptr->mane_spell[p_ptr->mane_num] = thrown_spell - RF4_SPELL_START; p_ptr->mane_dam[p_ptr->mane_num] = dam; p_ptr->mane_num++; - new_mane = TRUE; + p_ptr->new_mane = TRUE; p_ptr->redraw |= (PR_IMITATION); } diff --git a/src/mspells3.c b/src/mspells3.c index a6aafd0f9..33a35622c 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -1790,7 +1790,7 @@ void learn_spell(int monspell) sound(SOUND_STUDY); - new_mane = TRUE; + p_ptr->new_mane = TRUE; p_ptr->redraw |= (PR_STATE); } } diff --git a/src/player-effects.c b/src/player-effects.c index d7d494049..1c68a1dd8 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -125,7 +125,7 @@ void set_action(ACTION_IDX typ) case ACTION_LEARN: { msg_print(_("学習をやめた。", "You stop Learning")); - new_mane = FALSE; + p_ptr->new_mane = FALSE; break; } case ACTION_KAMAE: @@ -504,7 +504,7 @@ bool set_confused(TIME_EFFECT v) if (p_ptr->action == ACTION_LEARN) { msg_print(_("学習が続けられない！", "You cannot continue Learning!")); - new_mane = FALSE; + p_ptr->new_mane = FALSE; p_ptr->redraw |= (PR_STATE); p_ptr->action = ACTION_NONE; diff --git a/src/player-status.h b/src/player-status.h index c94fc805a..3356b4dad 100644 --- a/src/player-status.h +++ b/src/player-status.h @@ -384,6 +384,7 @@ struct player_type SPELL_IDX mane_spell[MAX_MANE]; HIT_POINT mane_dam[MAX_MANE]; s16b mane_num; + bool new_mane; #define CONCENT_RADAR_THRESHOLD 2 #define CONCENT_TELE_THRESHOLD 5 diff --git a/src/variable.c b/src/variable.c index c00aac5e9..c0290b922 100644 --- a/src/variable.c +++ b/src/variable.c @@ -48,8 +48,6 @@ MONSTER_IDX riding_t_m_idx; MONSTER_IDX today_mon; -bool new_mane; - #ifdef CHUUKEI bool chuukei_server; bool chuukei_client; diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c index adeef1085..0a2bd8b66 100644 --- a/src/view-mainwindow.c +++ b/src/view-mainwindow.c @@ -1109,7 +1109,7 @@ static void prt_state(void) case ACTION_LEARN: { strcpy(text, _("学習", "lear")); - if (new_mane) attr = TERM_L_RED; + if (p_ptr->new_mane) attr = TERM_L_RED; break; } case ACTION_FISH: @@ -1270,7 +1270,7 @@ static void prt_imitation(void) if (p_ptr->mane_num) { TERM_COLOR attr; - if (new_mane) attr = TERM_L_RED; + if (p_ptr->new_mane) attr = TERM_L_RED; else attr = TERM_WHITE; c_put_str(attr, _("まね", "Imit"), row_study, col_study); } -- 2.11.0