[Fix] #37353 VC++のC4100警告修正。 / Fix C4100 VC++ warning .

diff --git a/src/cmd2.c b/src/cmd2.c
index 013dcc4..0092d06 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -65,12 +65,12 @@ bool cmd_limit_cast(player_type *creature_ptr)
                msg_print(NULL);
                return TRUE;
        }
-       else if (p_ptr->anti_magic)
+       else if (creature_ptr->anti_magic)
        {
                msg_print(_("反魔法バリアが魔法を邪魔した！", "An anti-magic shell disrupts your magic!"));
                return TRUE;
        }
-       else if (p_ptr->shero)
+       else if (creature_ptr->shero)
        {
                msg_format(_("狂戦士化していて頭が回らない！", "You cannot think directly!"));
                return TRUE;
@@ -81,7 +81,7 @@ bool cmd_limit_cast(player_type *creature_ptr)
 
 bool cmd_limit_confused(player_type *creature_ptr)
 {
-       if (p_ptr->confused)
+       if (creature_ptr->confused)
        {
                msg_print(_("混乱していてできない！", "You are too confused!"));
                return TRUE;
@@ -91,7 +91,7 @@ bool cmd_limit_confused(player_type *creature_ptr)
 
 bool cmd_limit_arena(player_type *creature_ptr)
 {
-       if (p_ptr->inside_arena)
+       if (creature_ptr->inside_arena)
        {
                msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
                msg_print(NULL);

diff --git a/src/player-status.c b/src/player-status.c
index 42399d5..f0db43b 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -3815,10 +3815,10 @@ bool player_has_no_spellbooks(void)
 
 void take_turn(player_type *creature_ptr, PERCENTAGE need_cost)
 {
-       p_ptr->energy_use = (ENERGY)need_cost;
+       creature_ptr->energy_use = (ENERGY)need_cost;
 }
 
 void free_turn(player_type *creature_ptr)
 {
-       p_ptr->energy_use = 0;
+       creature_ptr->energy_use = 0;
 }

diff --git a/src/spells-status.c b/src/spells-status.c
index 72f521c..409563f 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -179,10 +179,10 @@ bool time_walk(player_type *creature_ptr)
        msg_print(NULL);
 
        /* Hack */
-       p_ptr->energy_need -= 1000 + (100 + p_ptr->csp - 50)*TURNS_PER_TICK / 10;
-       p_ptr->redraw |= (PR_MAP);
-       p_ptr->update |= (PU_MONSTERS);
-       p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
+       creature_ptr->energy_need -= 1000 + (100 + p_ptr->csp - 50)*TURNS_PER_TICK / 10;
+       creature_ptr->redraw |= (PR_MAP);
+       creature_ptr->update |= (PU_MONSTERS);
+       creature_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
        handle_stuff();
        return TRUE;
 }

diff --git a/src/spells2.c b/src/spells2.c
index e2ac7cc..62904f6 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -928,9 +928,9 @@ bool cleansing_nova(player_type *creature_ptr, bool magic, bool powerful)
 bool unleash_mana_storm(player_type *creature_ptr, bool powerful)
 {
        msg_print(_("強力な魔力が敵を引き裂いた！", "Mighty magics rend your enemies!"));
-       project(0, (powerful ? 7 : 5), p_ptr->y, p_ptr->x,
+       project(0, (powerful ? 7 : 5), creature_ptr->y, creature_ptr->x,
        (randint1(200) + (powerful ? 500 : 300)) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1);
-       if ((p_ptr->pclass != CLASS_MAGE) && (p_ptr->pclass != CLASS_HIGH_MAGE) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_MAGIC_EATER) && (p_ptr->pclass != CLASS_BLUE_MAGE))
+       if ((creature_ptr->pclass != CLASS_MAGE) && (creature_ptr->pclass != CLASS_HIGH_MAGE) && (creature_ptr->pclass != CLASS_SORCERER) && (creature_ptr->pclass != CLASS_MAGIC_EATER) && (creature_ptr->pclass != CLASS_BLUE_MAGE))
        {
                (void)take_hit(DAMAGE_NOESCAPE, 50, _("コントロールし難い強力な魔力の解放", "unleashing magics too mighty to control"), -1);
        }
@@ -5176,11 +5176,11 @@ bool sword_dancing(player_type *creature_ptr)
 bool confusing_light(player_type *creature_ptr)
 {
        msg_print(_("辺りを睨んだ...", "You glare nearby monsters..."));
-       slow_monsters(p_ptr->lev);
-       stun_monsters(p_ptr->lev * 4);
-       confuse_monsters(p_ptr->lev * 4);
-       turn_monsters(p_ptr->lev * 4);
-       stasis_monsters(p_ptr->lev * 4);
+       slow_monsters(creature_ptr->lev);
+       stun_monsters(creature_ptr->lev * 4);
+       confuse_monsters(creature_ptr->lev * 4);
+       turn_monsters(creature_ptr->lev * 4);
+       stasis_monsters(creature_ptr->lev * 4);
        return TRUE;
 }