OSDN Git Service

[Refactor] #38997 perilous_secrets() の参照整理 / Refactor references in perilous_secrets().
authordeskull <deskull@users.sourceforge.jp>
Mon, 16 Sep 2019 00:42:49 +0000 (09:42 +0900)
committerdeskull <deskull@users.sourceforge.jp>
Mon, 16 Sep 2019 00:42:49 +0000 (09:42 +0900)
src/spells-object.c
src/spells-object.h

index 25243ae..6b187cf 100644 (file)
@@ -821,43 +821,43 @@ bool brand_bolts(void)
 }
 
 
-bool perilous_secrets(player_type *creature_ptr)
+bool perilous_secrets(player_type *user_ptr)
 {
        if (!ident_spell(FALSE)) return FALSE;
 
        if (mp_ptr->spell_book)
        {
                /* Sufficient mana */
-               if (20 <= creature_ptr->csp)
+               if (20 <= user_ptr->csp)
                {
                        /* Use some mana */
-                       creature_ptr->csp -= 20;
+                       user_ptr->csp -= 20;
                }
 
                /* Over-exert the player */
                else
                {
-                       int oops = 20 - creature_ptr->csp;
+                       int oops = 20 - user_ptr->csp;
 
                        /* No mana left */
-                       creature_ptr->csp = 0;
-                       creature_ptr->csp_frac = 0;
+                       user_ptr->csp = 0;
+                       user_ptr->csp_frac = 0;
 
                        msg_print(_("石を制御できない!", "You are too weak to control the stone!"));
                        /* Hack -- Bypass free action */
-                       (void)set_paralyzed(p_ptr, creature_ptr->paralyzed + randint1(5 * oops + 1));
+                       (void)set_paralyzed(user_ptr, user_ptr->paralyzed + randint1(5 * oops + 1));
 
                        /* Confusing. */
-                       (void)set_confused(p_ptr, creature_ptr->confused + randint1(5 * oops + 1));
+                       (void)set_confused(user_ptr, user_ptr->confused + randint1(5 * oops + 1));
                }
-               creature_ptr->redraw |= (PR_MANA);
+               user_ptr->redraw |= (PR_MANA);
        }
-       take_hit(p_ptr, DAMAGE_LOSELIFE, damroll(1, 12), _("危険な秘密", "perilous secrets"), -1);
+       take_hit(user_ptr, DAMAGE_LOSELIFE, damroll(1, 12), _("危険な秘密", "perilous secrets"), -1);
        /* Confusing. */
-       if (one_in_(5)) (void)set_confused(p_ptr, creature_ptr->confused + randint1(10));
+       if (one_in_(5)) (void)set_confused(user_ptr, user_ptr->confused + randint1(10));
 
        /* Exercise a little care... */
-       if (one_in_(20)) take_hit(p_ptr, DAMAGE_LOSELIFE, damroll(4, 10), _("危険な秘密", "perilous secrets"), -1);
+       if (one_in_(20)) take_hit(user_ptr, DAMAGE_LOSELIFE, damroll(4, 10), _("危険な秘密", "perilous secrets"), -1);
        return TRUE;
 
 }
index c5c93b6..0dc86d1 100644 (file)
@@ -10,7 +10,7 @@ extern bool curse_weapon_object(bool force, object_type *o_ptr);
 extern bool curse_weapon(bool force, int slot);
 extern bool rustproof(void);
 extern bool brand_bolts(void);
-extern bool perilous_secrets(player_type *creature_ptr);
+extern bool perilous_secrets(player_type *user_ptr);
 extern void get_bloody_moon_flags(object_type *o_ptr);
 extern void phlogiston(void);
 extern bool bless_weapon(void);