変愚蛮怒のメインリポジトリです
修订版 | 724983c5c65824d27ea7f8da59bd902bc17b5ed9 (tree) |
---|---|
时间 | 2019-03-30 19:17:52 |
作者 | deskull <deskull@user...> |
Commiter | deskull |
[Refactor] #39077 POSITION 1件。同ソースインデント修正。
@@ -2815,7 +2815,6 @@ static void calc_hitpoints(void) | ||
2815 | 2815 | |
2816 | 2816 | /* Display hitpoints (later) */ |
2817 | 2817 | p_ptr->redraw |= (PR_HP); |
2818 | - | |
2819 | 2818 | p_ptr->window |= (PW_PLAYER); |
2820 | 2819 | } |
2821 | 2820 | } |
@@ -2828,7 +2827,8 @@ static void calc_hitpoints(void) | ||
2828 | 2827 | */ |
2829 | 2828 | static void calc_torch(void) |
2830 | 2829 | { |
2831 | - int i, rad; | |
2830 | + int i; | |
2831 | + POSITION rad; | |
2832 | 2832 | object_type *o_ptr; |
2833 | 2833 | BIT_FLAGS flgs[TR_FLAG_SIZE]; |
2834 | 2834 |
@@ -2864,7 +2864,7 @@ static void calc_torch(void) | ||
2864 | 2864 | if (have_flag(flgs, TR_LITE_M1)) rad -= 1; |
2865 | 2865 | if (have_flag(flgs, TR_LITE_M2)) rad -= 2; |
2866 | 2866 | if (have_flag(flgs, TR_LITE_M3)) rad -= 3; |
2867 | - p_ptr->cur_lite += (s16b)rad; | |
2867 | + p_ptr->cur_lite += rad; | |
2868 | 2868 | } |
2869 | 2869 | |
2870 | 2870 | /* max radius is 14 (was 5) without rewriting other code -- */ |
@@ -2916,7 +2916,6 @@ static void calc_spells(void) | ||
2916 | 2916 | REALM_IDX which; |
2917 | 2917 | int bonus = 0; |
2918 | 2918 | |
2919 | - | |
2920 | 2919 | concptr p; |
2921 | 2920 | |
2922 | 2921 | /* Hack -- must be literate */ |
@@ -3098,11 +3097,9 @@ static void calc_spells(void) | ||
3098 | 3097 | } |
3099 | 3098 | |
3100 | 3099 | #ifdef JP |
3101 | - msg_format("%sの%sを忘れてしまった。", | |
3102 | - do_spell(which, j % 32, SPELL_NAME), p); | |
3100 | + msg_format("%sの%sを忘れてしまった。", do_spell(which, j % 32, SPELL_NAME), p); | |
3103 | 3101 | #else |
3104 | - msg_format("You have forgotten the %s of %s.", p, | |
3105 | - do_spell(which, j % 32, SPELL_NAME)); | |
3102 | + msg_format("You have forgotten the %s of %s.", p, do_spell(which, j % 32, SPELL_NAME)); | |
3106 | 3103 | #endif |
3107 | 3104 | |
3108 | 3105 |
@@ -3519,9 +3516,7 @@ static void calc_mana(void) | ||
3519 | 3516 | |
3520 | 3517 | /* Display mana later */ |
3521 | 3518 | p_ptr->redraw |= (PR_MANA); |
3522 | - | |
3523 | - p_ptr->window |= (PW_PLAYER); | |
3524 | - p_ptr->window |= (PW_SPELL); | |
3519 | + p_ptr->window |= (PW_PLAYER | PW_SPELL); | |
3525 | 3520 | } |
3526 | 3521 | |
3527 | 3522 |