OSDN > ソフトウェアを探す > ゲーム/エンターテイメント > ロールプレイング > 変愚蛮怒 > SCM > git > hengband > コミット

変愚蛮怒
Fork
hengband
web

hengband: コミット

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

#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

--- a/src/externs.h

+++ b/src/externs.h

		@@ -396,9 +396,9 @@ extern bool closing_flag;
396	396	extern s16b panel_row_min, panel_row_max;
397	397	extern s16b panel_col_min, panel_col_max;
398	398	extern s16b panel_col_prt, panel_row_prt;
399		-extern s16b target_who;
400		-extern s16b target_col;
401		-extern s16b target_row;
	399	+extern idx target_who;
	400	+extern position target_col;
	401	+extern position target_row;
402	402	extern int player_uid;
403	403	extern int player_euid;
404	404	extern int player_egid;

		@@ -1219,7 +1219,7 @@ extern bool cave_player_teleportable_bold(int y, int x, u32b mode);
1219	1219	extern bool teleport_player_aux(int dis, u32b mode);
1220	1220	extern void teleport_player(int dis, u32b mode);
1221	1221	extern void teleport_player_away(int m_idx, int dis);
1222		-extern void teleport_player_to(int ny, int nx, u32b mode);
	1222	+extern void teleport_player_to(position ny, position nx, u32b mode);
1223	1223	extern void teleport_away_followable(int m_idx);
1224	1224	extern void teleport_level(int m_idx);
1225	1225	extern int choose_dungeon(cptr note, int y, int x);

		@@ -1583,7 +1583,7 @@ extern void breath(int y, int x, int m_idx, int typ, int dam_hp, int rad, bool b
1583	1583
1584	1584	/* mspells2.c */
1585	1585	extern void get_project_point(int sy, int sx, int ty, int tx, int flg);
1586		-extern bool monst_spell_monst(int m_idx);
	1586	+extern bool monst_spell_monst(idx m_idx);
1587	1587
1588	1588	/* mspells3.c */
1589	1589	extern bool do_cmd_cast_learned(void);

--- a/src/h-type.h

+++ b/src/h-type.h

		@@ -124,7 +124,7 @@ typedef byte object_type_value; /*!< ゲーム中のアイテム主分類の
124	124	typedef byte object_subtype_value; /!< ゲーム中のアイテム副分類の型定義 /
125	125	typedef s16b parameter_value; /!< ゲーム中のアイテム能力値の型定義 /
126	126
127		-typedef s32b str_offset; /!< テキストオフセットの型定義 /
	127	+typedef u32b str_offset; /!< テキストオフセットの型定義 /
128	128
129	129	/* Pointers to all the basic types defined above */
130	130

--- a/src/init.h

+++ b/src/init.h

		@@ -86,13 +86,10 @@ struct header
86	86
87	87	u16b head_size; /* Size of the "header" in bytes */
88	88
89		- u32b info_size; /* Size of the "info" array in bytes */
90		-
91		- u32b name_size; /* Size of the "name" array in bytes */
92		-
93		- u32b text_size; /* Size of the "text" array in bytes */
94		-
95		- u32b tag_size; /* Size of the "tag" array in bytes */
	89	+ str_offset info_size; /* Size of the "info" array in bytes */
	90	+ str_offset name_size; /* Size of the "name" array in bytes */
	91	+ str_offset text_size; /* Size of the "text" array in bytes */
	92	+ str_offset tag_size; /* Size of the "tag" array in bytes */
96	93
97	94	void *info_ptr;
98	95	char *name_ptr;

--- a/src/mspells2.c

+++ b/src/mspells2.c

		@@ -253,7 +253,7 @@ static bool dispel_check_monster(int m_idx, int t_idx)
253	253	* @details
254	254	* The player is only disturbed if able to be affected by the spell.
255	255	*/
256		-bool monst_spell_monst(int m_idx)
	256	+bool monst_spell_monst(idx m_idx)
257	257	{
258	258	int y = 0, x = 0;
259	259	int i, k, t_idx = 0;

--- a/src/spells3.c

+++ b/src/spells3.c

		@@ -556,9 +556,10 @@ void teleport_player_away(int m_idx, int dis)
556	556	* This function allows teleporting into vaults (!)
557	557	* </pre>
558	558	*/
559		-void teleport_player_to(int ny, int nx, u32b mode)
	559	+void teleport_player_to(position ny, position nx, u32b mode)
560	560	{
561		- int y, x, dis = 0, ctr = 0;
	561	+ position y, x;
	562	+ int dis = 0, ctr = 0;
562	563
563	564	if (p_ptr->anti_tele && !(mode & TELEPORT_NONMAGICAL))
564	565	{

		@@ -572,8 +573,8 @@ void teleport_player_to(int ny, int nx, u32b mode)
572	573	/* Pick a nearby legal location */
573	574	while (1)
574	575	{
575		- y = rand_spread(ny, dis);
576		- x = rand_spread(nx, dis);
	576	+ y = (position)rand_spread(ny, dis);
	577	+ x = (position)rand_spread(nx, dis);
577	578	if (in_bounds(y, x)) break;
578	579	}
579	580

--- a/src/variable.c

+++ b/src/variable.c