OSDN > Find Software > Games/Entertainment > Role-Playing > 変愚蛮怒 > SCM > git > hengband > Commit

変愚蛮怒
Fork
hengband
web

hengband: Commit

変愚蛮怒のメインリポジトリです

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

--- a/src/cmd2.c

+++ b/src/cmd2.c

		@@ -65,12 +65,12 @@ bool cmd_limit_cast(player_type *creature_ptr)
65	65	msg_print(NULL);
66	66	return TRUE;
67	67	}
68		- else if (p_ptr->anti_magic)
	68	+ else if (creature_ptr->anti_magic)
69	69	{
70	70	msg_print(_("反魔法バリアが魔法を邪魔した！", "An anti-magic shell disrupts your magic!"));
71	71	return TRUE;
72	72	}
73		- else if (p_ptr->shero)
	73	+ else if (creature_ptr->shero)
74	74	{
75	75	msg_format(_("狂戦士化していて頭が回らない！", "You cannot think directly!"));
76	76	return TRUE;

		@@ -81,7 +81,7 @@ bool cmd_limit_cast(player_type *creature_ptr)
81	81
82	82	bool cmd_limit_confused(player_type *creature_ptr)
83	83	{
84		- if (p_ptr->confused)
	84	+ if (creature_ptr->confused)
85	85	{
86	86	msg_print(_("混乱していてできない！", "You are too confused!"));
87	87	return TRUE;

		@@ -91,7 +91,7 @@ bool cmd_limit_confused(player_type *creature_ptr)
91	91
92	92	bool cmd_limit_arena(player_type *creature_ptr)
93	93	{
94		- if (p_ptr->inside_arena)
	94	+ if (creature_ptr->inside_arena)
95	95	{
96	96	msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
97	97	msg_print(NULL);

--- a/src/player-status.c

+++ b/src/player-status.c

		@@ -3815,10 +3815,10 @@ bool player_has_no_spellbooks(void)
3815	3815
3816	3816	void take_turn(player_type *creature_ptr, PERCENTAGE need_cost)
3817	3817	{
3818		- p_ptr->energy_use = (ENERGY)need_cost;
	3818	+ creature_ptr->energy_use = (ENERGY)need_cost;
3819	3819	}
3820	3820
3821	3821	void free_turn(player_type *creature_ptr)
3822	3822	{
3823		- p_ptr->energy_use = 0;
	3823	+ creature_ptr->energy_use = 0;
3824	3824	}

--- a/src/spells-status.c

+++ b/src/spells-status.c

		@@ -179,10 +179,10 @@ bool time_walk(player_type *creature_ptr)
179	179	msg_print(NULL);
180	180
181	181	/* Hack */
182		- p_ptr->energy_need -= 1000 + (100 + p_ptr->csp - 50)*TURNS_PER_TICK / 10;
183		- p_ptr->redraw \|= (PR_MAP);
184		- p_ptr->update \|= (PU_MONSTERS);
185		- p_ptr->window \|= (PW_OVERHEAD \| PW_DUNGEON);
	182	+ creature_ptr->energy_need -= 1000 + (100 + p_ptr->csp - 50)*TURNS_PER_TICK / 10;
	183	+ creature_ptr->redraw \|= (PR_MAP);
	184	+ creature_ptr->update \|= (PU_MONSTERS);
	185	+ creature_ptr->window \|= (PW_OVERHEAD \| PW_DUNGEON);
186	186	handle_stuff();
187	187	return TRUE;
188	188	}

--- a/src/spells2.c

+++ b/src/spells2.c

		@@ -928,9 +928,9 @@ bool cleansing_nova(player_type *creature_ptr, bool magic, bool powerful)
928	928	bool unleash_mana_storm(player_type *creature_ptr, bool powerful)
929	929	{
930	930	msg_print(_("強力な魔力が敵を引き裂いた！", "Mighty magics rend your enemies!"));
931		- project(0, (powerful ? 7 : 5), p_ptr->y, p_ptr->x,
	931	+ project(0, (powerful ? 7 : 5), creature_ptr->y, creature_ptr->x,
932	932	(randint1(200) + (powerful ? 500 : 300)) * 2, GF_MANA, PROJECT_KILL \| PROJECT_ITEM \| PROJECT_GRID, -1);
933		- 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))
	933	+ 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))
934	934	{
935	935	(void)take_hit(DAMAGE_NOESCAPE, 50, _("コントロールし難い強力な魔力の解放", "unleashing magics too mighty to control"), -1);
936	936	}

		@@ -5176,11 +5176,11 @@ bool sword_dancing(player_type *creature_ptr)
5176	5176	bool confusing_light(player_type *creature_ptr)
5177	5177	{
5178	5178	msg_print(_("辺りを睨んだ...", "You glare nearby monsters..."));
5179		- slow_monsters(p_ptr->lev);
5180		- stun_monsters(p_ptr->lev * 4);
5181		- confuse_monsters(p_ptr->lev * 4);
5182		- turn_monsters(p_ptr->lev * 4);
5183		- stasis_monsters(p_ptr->lev * 4);
	5179	+ slow_monsters(creature_ptr->lev);
	5180	+ stun_monsters(creature_ptr->lev * 4);
	5181	+ confuse_monsters(creature_ptr->lev * 4);
	5182	+ turn_monsters(creature_ptr->lev * 4);
	5183	+ stasis_monsters(creature_ptr->lev * 4);
5184	5184	return TRUE;
5185	5185	}
5186	5186