[Refactor] #37353 cnv_stat() と modify_stat_value() を player-status.c/h へ移動。

[hengband/hengband.git] / src / mind.c

diff --git a/src/mind.c b/src/mind.c
index 9f1b943..2b010b2 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -680,9 +680,9 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
        int             num = 0;
        TERM_LEN y = 1;
        TERM_LEN x = 10;
-       int             minfail = 0;
+       PERCENTAGE minfail = 0;
        PLAYER_LEVEL plev = p_ptr->lev;
-       int             chance = 0;
+       PERCENTAGE chance = 0;
        int             ask = TRUE;
        char            choice;
        char            out_val[160];
@@ -762,32 +762,32 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
     /* No redraw yet */
     redraw = FALSE;
 
-    for (i = 0; i < MAX_MIND_POWERS; i++)
+       for (i = 0; i < MAX_MIND_POWERS; i++)
        {
-         if (mind_ptr->info[i].min_lev <= plev)
-           {
-             num++;
-           }
+               if (mind_ptr->info[i].min_lev <= plev)
+               {
+                       num++;
+               }
        }
 
-    /* Build a prompt (accept all spells) */
-    if (only_browse)
+       /* Build a prompt (accept all spells) */
+       if (only_browse)
        {
-               (void) strnfmt(out_val, 78, 
-                                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                                      p, I2A(0), I2A(num - 1), p);
+               (void)strnfmt(out_val, 78,
+                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sについて知りますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+                       p, I2A(0), I2A(num - 1), p);
        }
        else
        {
-               (void) strnfmt(out_val, 78, 
-                                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
-                                               p, I2A(0), I2A(num - 1), p);
+               (void)strnfmt(out_val, 78,
+                       _("(%^s %c-%c, '*'で一覧, ESC) どの%sを使いますか？", "(%^ss %c-%c, *=List, ESC=exit) Use which %s? "),
+                       p, I2A(0), I2A(num - 1), p);
        }
 
        if (use_menu && !only_browse) screen_save();
-       /* Get a spell from the user */
 
-       choice= (always_show_list || use_menu) ? ESCAPE:1 ;
+       choice = (always_show_list || use_menu) ? ESCAPE : 1;
+
        while (!flag)
        {
                if(choice==ESCAPE) choice = ' '; 
@@ -1753,8 +1753,8 @@ void do_cmd_mind(void)
 {
        SPELL_IDX n = 0;
        int b = 0;
-       int             chance;
-       int             minfail = 0;
+       PERCENTAGE chance;
+       PERCENTAGE minfail = 0;
        PLAYER_LEVEL plev = p_ptr->lev;
        int             old_csp = p_ptr->csp;
        mind_type       spell;
@@ -1765,7 +1765,6 @@ void do_cmd_mind(void)
 
        if (cmd_limit_confused(p_ptr)) return;
 
-       /* get power */
        if (!get_mind_power(&n, FALSE)) return;
 
 #ifdef JP
@@ -1954,24 +1953,24 @@ void do_cmd_mind(void)
                switch(use_mind)
                {
                case MIND_MINDCRAFTER:
-                       /* Cast the spell */
+                       
                        cast = cast_mindcrafter_spell(n);
                        break;
                case MIND_KI:
-                       /* Cast the spell */
+                       
                        cast = cast_force_spell(n);
                        break;
                case MIND_BERSERKER:
-                       /* Cast the spell */
+                       
                        cast = cast_berserk_spell(n);
                        break;
                case MIND_MIRROR_MASTER:
-                       /* Cast the spell */
+                       
                        if( is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x]) )on_mirror = TRUE;
                        cast = cast_mirror_spell(n);
                        break;
                case MIND_NINJUTSU:
-                       /* Cast the spell */
+                       
                        cast = cast_ninja_spell(n);
                        break;
                default:
@@ -1983,11 +1982,14 @@ void do_cmd_mind(void)
        }
 
 
-       take_turn(p_ptr, 100);
        /* teleport from mirror costs small energy */
-       if( on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER )
+       if(on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER)
+       {
+         if( n==3 || n==5 || n==7 || n==16 ) take_turn(p_ptr, 50);
+       }
+       else
        {
-         if( n==3 || n==5 || n==7 || n==16 ) p_ptr->energy_use = 50;
+               take_turn(p_ptr, 100);
        }
 
        if ((use_mind == MIND_BERSERKER) || (use_mind == MIND_NINJUTSU))
@@ -2067,7 +2069,6 @@ void do_cmd_mind_browse(void)
 
        while(1)
        {
-               /* get power */
                if (!get_mind_power(&n, TRUE))
                {
                        screen_load();