X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=594e6c9682f86bda253d7f007455200bb0d177b8;hb=97ab6e743be47c3c082d699ddf862a792fe08e9b;hp=887e4fa30493547e73fb054b6c1031874bcb216e;hpb=dcb367ded40b41695af4ebab2eff9833f4879a22;p=hengband%2Fhengband.git

diff --git a/src/wizard2.c b/src/wizard2.c
index 887e4fa30..594e6c968 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "selfinfo.h"
 
 
 /*!
@@ -58,7 +59,7 @@ void do_cmd_rerate_aux(void)
  */
 void do_cmd_rerate(bool display)
 {
-	int percent;
+	PERCENTAGE percent;
 
 	/* Rerate */
 	do_cmd_rerate_aux();
@@ -72,13 +73,11 @@ void do_cmd_rerate(bool display)
 	p_ptr->update |= (PU_HP);
 	p_ptr->redraw |= (PR_HP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 
 	/* Handle stuff */
 	handle_stuff();
 
-	/* Message */
 	if (display)
 	{
 		msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
@@ -117,10 +116,10 @@ static bool set_gametime(void)
 	char ppp[80], tmp_val[40];
 
 	/* Prompt */
-	sprintf(ppp, "Dungeon Turn (0-%ld): ", dungeon_turn_limit);
+	sprintf(ppp, "Dungeon Turn (0-%ld): ", (long)dungeon_turn_limit);
 
 	/* Default */
-	sprintf(tmp_val, "%ld", dungeon_turn);
+	sprintf(tmp_val, "%ld", (long)dungeon_turn);
 
 	/* Query */
 	if (!get_string(ppp, tmp_val, 10)) return (FALSE);
@@ -144,13 +143,13 @@ static bool set_gametime(void)
 static void wiz_create_named_art(void)
 {
 	char tmp_val[10] = "";
-	int a_idx;
+	ARTIFACT_IDX a_idx;
 
 	/* Query */
 	if (!get_string("Artifact ID:", tmp_val, 3)) return;
 
 	/* Extract */
-	a_idx = atoi(tmp_val);
+	a_idx = (ARTIFACT_IDX)atoi(tmp_val);
 	if(a_idx < 0) a_idx = 0;
 	if(a_idx >= max_a_idx) a_idx = 0; 
 
@@ -168,14 +167,10 @@ static void wiz_create_named_art(void)
  */
 static void do_cmd_wiz_hack_ben(void)
 {
-	/* Oops */
 	msg_print("Oops.");
 	(void)probing();
 }
 
-
-#ifdef MONSTER_HORDES
-
 /*!
  * @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
  * @return なし
@@ -194,16 +189,14 @@ static void do_cmd_summon_horde(void)
 	(void)alloc_horde(wy, wx);
 }
 
-#endif /* MONSTER_HORDES */
-
 /*!
  * @brief 32ビット変数のビット配列を並べて描画する / Output a long int in binary format.
  * @return なし
  */
-static void prt_binary(u32b flags, int row, int col)
+static void prt_binary(BIT_FLAGS flags, int row, int col)
 {
-	int        	i;
-	u32b        bitmask;
+	int i;
+	u32b bitmask;
 
 	/* Scan the flags */
 	for (i = bitmask = 1; i <= 32; i++, bitmask *= 2)
@@ -233,7 +226,7 @@ static void prt_binary(u32b flags, int row, int col)
  * @param col 表示行
  * @return なし
  */
-static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_POSITION row, TERM_POSITION col)
+static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_LEN row, TERM_LEN col)
 {
 	int i, j;
 	int home = 0;
@@ -258,7 +251,7 @@ static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_PO
 		int total_frac = 0;
 		for (j = 0; j < alloc_kind_size; j++)
 		{
-			int prob = 0;
+			PERCENTAGE prob = 0;
 
 			if (table[j].level <= i)
 			{
@@ -565,7 +558,7 @@ static void do_cmd_wiz_change(void)
 static void wiz_display_item(object_type *o_ptr)
 {
 	int i, j = 13;
-	u32b flgs[TR_FLAG_SIZE];
+	BIT_FLAGS flgs[TR_FLAG_SIZE];
 	char buf[256];
 
 	/* Extract the flags */
@@ -710,7 +703,7 @@ static tval_desc tvals[] =
  * @param k_idx ベースアイテムID
  * @return なし
  */
-void strip_name(char *buf, int k_idx)
+void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
 {
 	char *t;
 
@@ -745,16 +738,17 @@ void strip_name(char *buf, int k_idx)
  * This function returns the k_idx of an object type, or zero if failed
  * List up to 50 choices in three columns
  */
-static IDX wiz_create_itemtype(void)
+static KIND_OBJECT_IDX wiz_create_itemtype(void)
 {
-	int i, num, max_num;
-	int col, row;
+	KIND_OBJECT_IDX i;
+	int num, max_num;
+	TERM_LEN col, row;
 	OBJECT_TYPE_VALUE tval;
 
 	cptr tval_desc;
 	char ch;
 
-	int choice[80];
+	KIND_OBJECT_IDX choice[80];
 
 	char buf[160];
 
@@ -1008,7 +1002,6 @@ static void wiz_reroll_item(object_type *o_ptr)
 		/* Combine / Reorder the pack (later) */
 		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 	}
 }
@@ -1035,7 +1028,7 @@ static void wiz_statistics(object_type *o_ptr)
 	char ch;
 	cptr quality;
 
-	u32b mode;
+	BIT_FLAGS mode;
 
 	object_type forge;
 	object_type	*q_ptr;
@@ -1046,7 +1039,7 @@ static void wiz_statistics(object_type *o_ptr)
 	char tmp_val[80];
 
 
-	/* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+	/* Mega-Hack -- allow multiple artifacts */
 	if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
 
 
@@ -1105,11 +1098,8 @@ static void wiz_statistics(object_type *o_ptr)
 				/* Allow interupt */
 				if (inkey())
 				{
-					/* Flush */
 					flush();
-
-					/* Stop rolling */
-					break;
+					break; // stop rolling
 				}
 
 				/* Dump the stats */
@@ -1128,7 +1118,7 @@ static void wiz_statistics(object_type *o_ptr)
 			make_object(q_ptr, mode);
 
 
-			/* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+			/* Mega-Hack -- allow multiple artifacts */
 			if (object_is_fixed_artifact(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
 
 
@@ -1272,7 +1262,7 @@ static void do_cmd_wiz_blue_mage(void)
  */
 static void do_cmd_wiz_play(void)
 {
-	int item;
+	OBJECT_IDX item;
 
 	object_type	forge;
 	object_type *q_ptr;
@@ -1286,7 +1276,6 @@ static void do_cmd_wiz_play(void)
 	cptr q, s;
 
 	item_tester_no_ryoute = TRUE;
-	/* Get an item */
 	q = "Play with which object? ";
 	s = "You have nothing to play with.";
 	if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return;
@@ -1366,7 +1355,6 @@ static void do_cmd_wiz_play(void)
 	/* Accept change */
 	if (changed)
 	{
-		/* Message */
 		msg_print("Changes accepted.");
 
 		/* Recalcurate object's weight */
@@ -1386,7 +1374,6 @@ static void do_cmd_wiz_play(void)
 		/* Combine / Reorder the pack (later) */
 		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 	}
 
@@ -1415,7 +1402,7 @@ static void wiz_create_item(void)
 	object_type	forge;
 	object_type *q_ptr;
 
-	IDX k_idx;
+	OBJECT_IDX k_idx;
 
 	/* Save the screen */
 	screen_save();
@@ -1431,7 +1418,7 @@ static void wiz_create_item(void)
 
 	if (k_info[k_idx].gen_flags & TRG_INSTA_ART)
 	{
-		int i;
+		ARTIFACT_IDX i;
 
 		/* Artifactify */
 		for (i = 1; i < max_a_idx; i++)
@@ -1476,53 +1463,8 @@ static void wiz_create_item(void)
  */
 static void do_cmd_wiz_cure_all(void)
 {
-	/* Restore stats */
-	(void)res_stat(A_STR);
-	(void)res_stat(A_INT);
-	(void)res_stat(A_WIS);
-	(void)res_stat(A_CON);
-	(void)res_stat(A_DEX);
-	(void)res_stat(A_CHR);
-
-	/* Restore the level */
-	(void)restore_level();
-
-	/* Heal the player */
-	if (p_ptr->chp < p_ptr->mhp)
-	{
-		p_ptr->chp = p_ptr->mhp;
-		p_ptr->chp_frac = 0;
-
-		/* Redraw */
-		p_ptr->redraw |= (PR_HP);
-
-		/* Window stuff */
-		p_ptr->window |= (PW_PLAYER);
-	}
-
-	/* Restore mana */
-	if (p_ptr->csp < p_ptr->msp)
-	{
-		p_ptr->csp = p_ptr->msp;
-		p_ptr->csp_frac = 0;
-
-		p_ptr->redraw |= (PR_MANA);
-		p_ptr->window |= (PW_PLAYER);
-		p_ptr->window |= (PW_SPELL);
-	}
-
-	/* Cure stuff */
-	(void)set_blind(0);
-	(void)set_confused(0);
-	(void)set_poisoned(0);
-	(void)set_afraid(0);
-	(void)set_paralyzed(0);
-	(void)set_image(0);
-	(void)set_stun(0);
-	(void)set_cut(0);
-	(void)set_slow(0, TRUE);
-
-	/* No longer hungry */
+	(void)life_stream(FALSE, FALSE);
+	(void)restore_mana(TRUE);
 	(void)set_food(PY_FOOD_MAX - 1);
 }
 
@@ -1538,9 +1480,8 @@ static void do_cmd_wiz_jump(void)
 	if (command_arg <= 0)
 	{
 		char	ppp[80];
-
 		char	tmp_val[160];
-		int		tmp_dungeon_type;
+		DUNGEON_IDX tmp_dungeon_type;
 
 		/* Prompt */
 		sprintf(ppp, "Jump which dungeon : ");
@@ -1551,11 +1492,12 @@ static void do_cmd_wiz_jump(void)
 		/* Ask for a level */
 		if (!get_string(ppp, tmp_val, 2)) return;
 
-		tmp_dungeon_type = atoi(tmp_val);
+		tmp_dungeon_type = (DUNGEON_IDX)atoi(tmp_val);
 		if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND;
 
 		/* Prompt */
-		sprintf(ppp, "Jump to level (0, %d-%d): ", d_info[tmp_dungeon_type].mindepth, d_info[tmp_dungeon_type].maxdepth);
+		sprintf(ppp, "Jump to level (0, %d-%d): ",
+			(int)d_info[tmp_dungeon_type].mindepth, (int)d_info[tmp_dungeon_type].maxdepth);
 
 		/* Default */
 		sprintf(tmp_val, "%d", (int)dun_level);
@@ -1564,16 +1506,16 @@ static void do_cmd_wiz_jump(void)
 		if (!get_string(ppp, tmp_val, 10)) return;
 
 		/* Extract request */
-		command_arg = (s16b)atoi(tmp_val);
+		command_arg = (COMMAND_ARG)atoi(tmp_val);
 
-		dungeon_type = (byte_hack)tmp_dungeon_type;
+		dungeon_type = tmp_dungeon_type;
 	}
 
 	/* Paranoia */
 	if (command_arg < d_info[dungeon_type].mindepth) command_arg = 0;
 
 	/* Paranoia */
-	if (command_arg > d_info[dungeon_type].maxdepth) command_arg = d_info[dungeon_type].maxdepth;
+	if (command_arg > d_info[dungeon_type].maxdepth) command_arg = (COMMAND_ARG)d_info[dungeon_type].maxdepth;
 
 	/* Accept request */
 	msg_format("You jump to dungeon level %d.", command_arg);
@@ -1652,7 +1594,6 @@ static void do_cmd_wiz_learn(void)
 static void do_cmd_wiz_summon(int num)
 {
 	int i;
-
 	for (i = 0; i < num; i++)
 	{
 		(void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
@@ -1667,7 +1608,7 @@ static void do_cmd_wiz_summon(int num)
  * @param r_idx モンスター種族ID
  * @return なし
  * @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
  */
 static void do_cmd_wiz_named(MONRACE_IDX r_idx)
 {
@@ -1681,7 +1622,7 @@ static void do_cmd_wiz_named(MONRACE_IDX r_idx)
  * @param r_idx モンスター種族ID
  * @return なし
  * @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
  */
 static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
 {
@@ -1814,7 +1755,6 @@ static void do_cmd_wiz_create_feature(void)
 	else if (have_flag(f_ptr->flags, FF_MIRROR))
 		c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
 
-	/* Notice */
 	note_spot(y, x);
 
 	/* Redraw */
@@ -1852,7 +1792,6 @@ static void do_cmd_dump_options(void)
 	/* Open the file */
 	fff = my_fopen(buf, "a");
 
-	/* Oops */
 	if (!fff)
 	{
 		msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
@@ -2036,11 +1975,9 @@ void do_cmd_debug(void)
 		do_cmd_rerate(TRUE);
 		break;
 
-#ifdef MONSTER_HORDES
 	case 'H':
 		do_cmd_summon_horde();
 		break;
-#endif /* MONSTER_HORDES */
 
 	/* Identify */
 	case 'i':