From 78de0f717ae1fd335608f1d54d974f44e0aad109 Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 31 Jan 2019 12:39:59 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?= =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.=20(BASE=5F?= =?utf8?q?STATUS=20/=20A=5FMAX)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/racial.c | 2 +- src/spells3.c | 6 +++--- src/view-mainwindow.c | 2 +- src/wizard2.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/racial.c b/src/racial.c index 3d45d97f1..7bf0f972e 100644 --- a/src/racial.c +++ b/src/racial.c @@ -242,7 +242,7 @@ static PERCENTAGE racial_chance(power_desc_type *pd_ptr) int i; int val; int sum = 0; - int stat = p_ptr->stat_cur[pd_ptr->stat]; + BASE_STATUS stat = p_ptr->stat_cur[pd_ptr->stat]; /* No chance for success */ if ((p_ptr->lev < min_level) || p_ptr->confused) diff --git a/src/spells3.c b/src/spells3.c index 85be23418..83c59d2ac 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -1100,8 +1100,8 @@ void mutate_player(void) int ii, jj, i; /* Pick a pair of stats */ - ii = randint0(6); - for (jj = ii; jj == ii; jj = randint0(6)) /* loop */; + ii = randint0(A_MAX); + for (jj = ii; jj == ii; jj = randint0(A_MAX)) /* loop */; max1 = p_ptr->stat_max[ii]; cur1 = p_ptr->stat_cur[ii]; @@ -1113,7 +1113,7 @@ void mutate_player(void) p_ptr->stat_max[jj] = max1; p_ptr->stat_cur[jj] = cur1; - for (i=0;i<6;i++) + for (i = 0; i < A_MAX; i++) { if(p_ptr->stat_max[i] > p_ptr->stat_max_max[i]) p_ptr->stat_max[i] = p_ptr->stat_max_max[i]; if(p_ptr->stat_cur[i] > p_ptr->stat_max_max[i]) p_ptr->stat_cur[i] = p_ptr->stat_max_max[i]; diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c index 56f552efc..673d0d9f3 100644 --- a/src/view-mainwindow.c +++ b/src/view-mainwindow.c @@ -195,7 +195,7 @@ static void prt_dungeon(void) */ static void prt_stat(int stat) { - char tmp[32]; + GAME_TEXT tmp[32]; /* Display "injured" stat */ if (p_ptr->stat_cur[stat] < p_ptr->stat_max[stat]) diff --git a/src/wizard2.c b/src/wizard2.c index 0d7831770..ca8ab1b51 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -395,7 +395,7 @@ static void do_cmd_wiz_change_aux(void) else if (tmp_int < 3) tmp_int = 3; /* Save it */ - p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (s16b)tmp_int; + p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (BASE_STATUS)tmp_int; } -- 2.11.0