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

変愚蛮怒
Fork
hengband
web

hengband: Commit

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

hack_mind を is_loading_now に改名。未使用変数 inven_nxt を削除。 / Rename hack_mind to is_loading_now. Delete unused variable inven_nxt.

--- a/src/dungeon.c

+++ b/src/dungeon.c

		@@ -5644,7 +5644,7 @@ static void dungeon(bool load_game)
5644	5644	base_level = dun_level;
5645	5645
5646	5646	/* Reset various flags */
5647		- hack_mind = FALSE;
	5647	+ is_loading_now = FALSE;
5648	5648
5649	5649	/* Not leaving */
5650	5650	p_ptr->leaving = FALSE;

		@@ -5812,7 +5812,7 @@ static void dungeon(bool load_game)
5812	5812	/* Reset the object generation level */
5813	5813	object_level = base_level;
5814	5814
5815		- hack_mind = TRUE;
	5815	+ is_loading_now = TRUE;
5816	5816
5817	5817	if (p_ptr->energy_need > 0 && !p_ptr->inside_battle &&
5818	5818	(dun_level \|\| p_ptr->leaving_dungeon \|\| p_ptr->inside_arena))

--- a/src/externs.h

+++ b/src/externs.h

		@@ -189,7 +189,6 @@ extern bool shimmer_monsters;
189	189	extern bool shimmer_objects;
190	190	extern bool repair_monsters;
191	191	extern bool repair_objects;
192		-extern s16b inven_nxt;
193	192	extern s16b inven_cnt;
194	193	extern s16b equip_cnt;
195	194	extern s16b o_max;

		@@ -204,7 +203,7 @@ extern int leaving_quest;
204	203	extern bool reinit_wilderness;
205	204	extern bool multi_rew;
206	205	extern char summon_kin_type;
207		-extern bool hack_mind;
	206	+extern bool is_loading_now;
208	207	extern bool hack_mutation;
209	208
210	209

--- a/src/files.c

+++ b/src/files.c

		@@ -6127,7 +6127,7 @@ void do_cmd_save_game(int is_autosave)
6127	6127	(void)strcpy(p_ptr->died_from, _("(元気に生きている)", "(alive and well)"));
6128	6128
6129	6129	/* HACK -- don't get sanity blast on updating view */
6130		- hack_mind = FALSE;
	6130	+ is_loading_now = FALSE;
6131	6131
6132	6132	/* Update stuff */
6133	6133	update_stuff();

		@@ -6136,7 +6136,7 @@ void do_cmd_save_game(int is_autosave)
6136	6136	mproc_init();
6137	6137
6138	6138	/* HACK -- reset the hackish flag */
6139		- hack_mind = TRUE;
	6139	+ is_loading_now = TRUE;
6140	6140	}
6141	6141
6142	6142

--- a/src/monster2.c

+++ b/src/monster2.c

		@@ -1978,7 +1978,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
1978	1978	}
1979	1979	else power *= 2;
1980	1980
1981		- if (!hack_mind)
	1981	+ if (!is_loading_now)
1982	1982	return; /* No effect yet, just loaded... */
1983	1983
1984	1984	if (!m_ptr->ml)

--- a/src/variable.c

+++ b/src/variable.c

		@@ -153,8 +153,7 @@ bool shimmer_objects; /* Hack -- optimize multi-hued objects */
153	153	bool repair_monsters; /* Hack -- optimize detect monsters */
154	154	bool repair_objects; /* Hack -- optimize detect objects */
155	155
156		-s16b inven_nxt; /* Hack -- unused */
157		-bool hack_mind; /!< ロード直後にcalc_bonus()時の徳変化、及びsanity_blast()による以上抑止 /
	156	+bool is_loading_now; /!< ロード直後にcalc_bonus()時の徳変化、及びsanity_blast()による異常を抑止する /
158	157	bool hack_mutation;
159	158
160	159	s16b inven_cnt; /* Number of items in inventory */

--- a/src/xtra1.c

+++ b/src/xtra1.c

		@@ -5697,7 +5697,7 @@ void calc_bonuses(void)
5697	5697	if (p_ptr->icky_wield[i])
5698	5698	{
5699	5699	msg_print(_("今の装備はどうも自分にふさわしくない気がする。", "You do not feel comfortable with your weapon."));
5700		- if (hack_mind)
	5700	+ if (is_loading_now)
5701	5701	{
5702	5702	chg_virtue(V_FAITH, -1);
5703	5703	}

		@@ -5744,7 +5744,7 @@ void calc_bonuses(void)
5744	5744	if (heavy_armor())
5745	5745	{
5746	5746	msg_print(_("装備が重くてバランスを取れない。", "The weight of your armor disrupts your balance."));
5747		- if (hack_mind)
	5747	+ if (is_loading_now)
5748	5748	{
5749	5749	chg_virtue(V_HARMONY, -1);
5750	5750	}