X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=17c8a2d4039e0ca3a7577b69d0454fe2a4809366;hb=547ecfbda2c09bb8238bd955ff51c2869823e5a1;hp=ba0fd65eca00448166b70f920b6b1b53d5e66682;hpb=819e90a6a18b4ef95f59066cb339428c9be1902b;p=hengband%2Fhengband.git

diff --git a/src/wizard2.c b/src/wizard2.c
index ba0fd65ec..17c8a2d40 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,9 @@ 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 +114,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 +141,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 +165,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 +187,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,14 +224,14 @@ static void prt_binary(u32b flags, int row, int col)
  * @param col 表示行
  * @return なし
  */
-static void prt_alloc(byte tval, byte sval, int row, int 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;
 	u32b rarity[K_MAX_DEPTH];
 	u32b total[K_MAX_DEPTH];
 	s32b display[22];
-	cptr r = "+---Rate---+";
+	concptr r = "+---Rate---+";
 	object_kind *k_ptr;
 
 
@@ -258,7 +249,7 @@ static void prt_alloc(byte tval, byte sval, int row, int col)
 		int total_frac = 0;
 		for (j = 0; j < alloc_kind_size; j++)
 		{
-			int prob = 0;
+			PERCENTAGE prob = 0;
 
 			if (table[j].level <= i)
 			{
@@ -354,7 +345,7 @@ static void do_cmd_wiz_reset_class(void)
 	/* {.} and {$} effect p_ptr->warning and TRC_TELEPORT_SELF */
 	p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
 
-	update_stuff();
+	handle_stuff();
 }
 
 
@@ -388,7 +379,7 @@ static void do_cmd_wiz_change_aux(void)
 
 
 	/* Query the stats */
-	for (i = 0; i < 6; i++)
+	for (i = 0; i < A_MAX; i++)
 	{
 		/* Prompt */
 		sprintf(ppp, "%s (3-%d): ", stat_names[i], p_ptr->stat_max_max[i]);
@@ -459,7 +450,6 @@ static void do_cmd_wiz_change_aux(void)
 	/* Save */
 	p_ptr->au = tmp_long;
 
-
 	/* Default */
 	sprintf(tmp_val, "%ld", (long)(p_ptr->max_exp));
 
@@ -493,8 +483,6 @@ static void do_cmd_wiz_change(void)
 {
 	/* Interact */
 	do_cmd_wiz_change_aux();
-
-	/* Redraw everything */
 	do_cmd_redraw();
 }
 
@@ -565,10 +553,8 @@ 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 */
 	object_flags(o_ptr, flgs);
 
 	/* Clear the screen */
@@ -641,7 +627,7 @@ static void wiz_display_item(object_type *o_ptr)
 typedef struct tval_desc
 {
 	int        tval; /*!< 大項目のID */
-	cptr       desc; /*!< 大項目名 */
+	concptr       desc; /*!< 大項目名 */
 } tval_desc;
 
 /*!
@@ -710,13 +696,13 @@ 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;
 
 	object_kind *k_ptr = &k_info[k_idx];
 
-	cptr str = (k_name + k_ptr->name);
+	concptr str = (k_name + k_ptr->name);
 
 
 	/* Skip past leading characters */
@@ -745,21 +731,20 @@ 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 int 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;
+	concptr tval_desc;
 	char ch;
 
-	int choice[80];
+	KIND_OBJECT_IDX choice[80];
 
 	char buf[160];
 
-
-	/* Clear screen */
 	Term_clear();
 
 	/* Print all tval's and their descriptions */
@@ -792,8 +777,6 @@ static int wiz_create_itemtype(void)
 
 
 	/*** And now we go for k_idx ***/
-
-	/* Clear screen */
 	Term_clear();
 
 	/* We have to search the whole itemlist. */
@@ -848,7 +831,7 @@ static int wiz_create_itemtype(void)
  */
 static void wiz_tweak_item(object_type *o_ptr)
 {
-	cptr p;
+	concptr p;
 	char tmp_val[80];
 
 	/* Hack -- leave artifacts alone */
@@ -899,8 +882,6 @@ static void wiz_reroll_item(object_type *o_ptr)
 	/* Hack -- leave artifacts alone */
 	if (object_is_artifact(o_ptr)) return;
 
-
-	/* Get local object */
 	q_ptr = &forge;
 
 	/* Copy the object */
@@ -1001,14 +982,11 @@ static void wiz_reroll_item(object_type *o_ptr)
 	{
 		/* Apply changes */
 		object_copy(o_ptr, q_ptr);
-
-		/* Recalculate bonuses */
 		p_ptr->update |= (PU_BONUS);
 
 		/* Combine / Reorder the pack (later) */
-		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+		p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 	}
 }
@@ -1033,27 +1011,27 @@ static void wiz_statistics(object_type *o_ptr)
 	u32b test_roll = 1000000;
 
 	char ch;
-	cptr quality;
+	concptr quality;
 
-	u32b mode;
+	BIT_FLAGS mode;
 
 	object_type forge;
 	object_type	*q_ptr;
 
-	cptr q = "Rolls: %ld  Correct: %ld  Matches: %ld  Better: %ld  Worse: %ld  Other: %ld";
+	concptr q = "Rolls: %ld  Correct: %ld  Matches: %ld  Better: %ld  Worse: %ld  Other: %ld";
 
-	cptr p = "Enter number of items to roll: ";
+	concptr p = "Enter number of items to roll: ";
 	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;
 
 
 	/* Interact */
 	while (TRUE)
 	{
-		cptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? ";
+		concptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? ";
 
 		/* Display item */
 		wiz_display_item(o_ptr);
@@ -1105,30 +1083,22 @@ static void wiz_statistics(object_type *o_ptr)
 				/* Allow interupt */
 				if (inkey())
 				{
-					/* Flush */
 					flush();
-
-					/* Stop rolling */
-					break;
+					break; // stop rolling
 				}
 
 				/* Dump the stats */
 				prt(format(q, i, correct, matches, better, worse, other), 0, 0);
 				Term_fresh();
 			}
-
-
-			/* Get local object */
 			q_ptr = &forge;
-
-			/* Wipe the object */
 			object_wipe(q_ptr);
 
 			/* Create an object */
 			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;
 
 
@@ -1234,14 +1204,12 @@ static void wiz_quantity_item(object_type *o_ptr)
  */
 static void do_cmd_wiz_blue_mage(void)
 {
+	int i = 0;
+	int j = 0;
+	BIT_FLAGS f4 = 0L, f5 = 0L, f6 = 0L;
 
-	int				i = 0;
-	int				j = 0;
-	s32b            f4 = 0, f5 = 0, f6 = 0;	
-
-	for (j=1; j<6; j++)
+	for (j = 1; j < A_MAX; j++)
 	{
-
 		set_rf_masks(&f4, &f5, &f6, j);
 
 		for (i = 0; i < 32; i++)
@@ -1272,49 +1240,27 @@ 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;
-
 	object_type *o_ptr;
-
 	char ch;
-
 	bool changed;
+	concptr q, s;
 
-	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;
 
-	/* Get the item (in the pack) */
-	if (item >= 0)
-	{
-		o_ptr = &inventory[item];
-	}
+	o_ptr = choose_object(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT));
 
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
+	if (!o_ptr) return;
 	
 	/* The item was not changed */
 	changed = FALSE;
 
-
-	/* Save the screen */
 	screen_save();
 
-
-	/* Get local object */
 	q_ptr = &forge;
-
-	/* Copy object */
 	object_copy(q_ptr, o_ptr);
 
 
@@ -1358,15 +1304,12 @@ static void do_cmd_wiz_play(void)
 		}
 	}
 
-
-	/* Restore the screen */
 	screen_load();
 
 
 	/* Accept change */
 	if (changed)
 	{
-		/* Message */
 		msg_print("Changes accepted.");
 
 		/* Recalcurate object's weight */
@@ -1379,14 +1322,11 @@ static void do_cmd_wiz_play(void)
 		/* Change */
 		object_copy(o_ptr, q_ptr);
 
-
-		/* Recalculate bonuses */
 		p_ptr->update |= (PU_BONUS);
 
 		/* Combine / Reorder the pack (later) */
-		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+		p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 	}
 
@@ -1415,15 +1355,12 @@ static void wiz_create_item(void)
 	object_type	forge;
 	object_type *q_ptr;
 
-	IDX k_idx;
-
-	/* Save the screen */
+	OBJECT_IDX k_idx;
 	screen_save();
 
 	/* Get object base type */
 	k_idx = wiz_create_itemtype();
 
-	/* Restore the screen */
 	screen_load();
 
 	/* Return if failed */
@@ -1431,7 +1368,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++)
@@ -1451,14 +1388,9 @@ static void wiz_create_item(void)
 			return;
 		}
 	}
-
-	/* Get local object */
 	q_ptr = &forge;
-
-	/* Create the item */
 	object_prep(q_ptr, k_idx);
 
-	/* Apply magic */
 	apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
 
 	/* Drop the object from heaven */
@@ -1476,53 +1408,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 +1425,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 +1437,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 +1451,14 @@ 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);
@@ -1617,7 +1502,7 @@ static void do_cmd_wiz_jump(void)
  */
 static void do_cmd_wiz_learn(void)
 {
-	IDX i;
+	KIND_OBJECT_IDX i;
 
 	object_type forge;
 	object_type *q_ptr;
@@ -1630,13 +1515,8 @@ static void do_cmd_wiz_learn(void)
 		/* Induce awareness */
 		if (k_ptr->level <= command_arg)
 		{
-			/* Get local object */
 			q_ptr = &forge;
-
-			/* Prepare object */
 			object_prep(q_ptr, i);
-
-			/* Awareness */
 			object_aware(q_ptr);
 		}
 	}
@@ -1652,10 +1532,9 @@ 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));
+		(void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE), '\0');
 	}
 }
 
@@ -1667,9 +1546,9 @@ 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(int r_idx)
+static void do_cmd_wiz_named(MONRACE_IDX r_idx)
 {
 	(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
 }
@@ -1681,9 +1560,9 @@ static void do_cmd_wiz_named(int 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(int r_idx)
+static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
 {
 	(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
 }
@@ -1697,8 +1576,7 @@ static void do_cmd_wiz_named_friendly(int r_idx)
  */
 static void do_cmd_wiz_zap(void)
 {
-	int i;
-
+	MONSTER_IDX i;
 
 	/* Genocide everyone nearby */
 	for (i = 1; i < m_max; i++)
@@ -1716,7 +1594,7 @@ static void do_cmd_wiz_zap(void)
 		{
 			if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 			{
-				char m_name[80];
+				GAME_TEXT m_name[MAX_NLEN];
 
 				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
@@ -1735,7 +1613,7 @@ static void do_cmd_wiz_zap(void)
  */
 static void do_cmd_wiz_zap_all(void)
 {
-	int i;
+	MONSTER_IDX i;
 
 	/* Genocide everyone */
 	for (i = 1; i < m_max; i++)
@@ -1750,7 +1628,7 @@ static void do_cmd_wiz_zap_all(void)
 
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
-			char m_name[80];
+			GAME_TEXT m_name[MAX_NLEN];
 
 			monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
@@ -1788,7 +1666,7 @@ static void do_cmd_wiz_create_feature(void)
 	if (!get_string(_("地形: ", "Feature: "), tmp_val, 3)) return;
 
 	/* Extract */
-	tmp_feat = atoi(tmp_val);
+	tmp_feat = (IDX)atoi(tmp_val);
 	if (tmp_feat < 0) tmp_feat = 0;
 	else if (tmp_feat >= max_f_idx) tmp_feat = max_f_idx - 1;
 
@@ -1799,7 +1677,7 @@ static void do_cmd_wiz_create_feature(void)
 	if (!get_string(_("地形 (mimic): ", "Feature (mimic): "), tmp_val, 3)) return;
 
 	/* Extract */
-	tmp_mimic = atoi(tmp_val);
+	tmp_mimic = (IDX)atoi(tmp_val);
 	if (tmp_mimic < 0) tmp_mimic = 0;
 	else if (tmp_mimic >= max_f_idx) tmp_mimic = max_f_idx - 1;
 
@@ -1814,10 +1692,7 @@ 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 */
 	lite_spot(y, x);
 
 	/* Update some things */
@@ -1852,7 +1727,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 +1910,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':
@@ -2107,6 +1979,28 @@ void do_cmd_debug(void)
 		teleport_player(10, 0L);
 		break;
 
+	/* Take a Quests */
+	case 'Q':
+		{
+			char ppp[30];
+			char tmp_val[5];
+			int tmp_int;
+			sprintf(ppp, "QuestID (0-%d):", max_q_idx - 1);
+			sprintf(tmp_val, "%d", 0);
+
+			if (!get_string(ppp, tmp_val, 3)) return;
+			tmp_int = atoi(tmp_val);
+
+			if(tmp_int < 0) break;
+			if(tmp_int >= max_q_idx) break;
+
+			p_ptr->inside_quest = (QUEST_IDX)tmp_int;
+			process_dungeon_file("q_info.txt", 0, 0, 0, 0);
+			quest[tmp_int].status = QUEST_STATUS_TAKEN;
+			p_ptr->inside_quest = 0;
+		}
+		break;
+
 	/* Complete a Quest -KMW- */
 	case 'q':
 		if(p_ptr->inside_quest)
@@ -2190,6 +2084,22 @@ void do_cmd_debug(void)
 		do_cmd_wiz_hack_ben();
 		break;
 
+	/* For temporary test. */
+	case 'X':
+	{
+		INVENTORY_IDX i;
+		for(i = INVEN_TOTAL - 1; i >= 0; i--)
+		{
+			if(inventory[i].k_idx) inven_drop(i, 999);
+		}
+		player_outfit();
+		break;
+	}
+
+	case 'V':
+		do_cmd_wiz_reset_class();
+		break;
+
 	/* Not a Wizard Command */
 	default:
 		msg_print("That is not a valid debug command.");
@@ -2197,6 +2107,111 @@ void do_cmd_debug(void)
 	}
 }
 
+void cheat_death(player_type *creature_ptr)
+{
+	/* Mark social class, reset age, if needed */
+	if (creature_ptr->sc) creature_ptr->sc = creature_ptr->age = 0;
+
+	/* Increase age */
+	creature_ptr->age++;
+
+	/* Mark savefile */
+	creature_ptr->noscore |= 0x0001;
+
+	msg_print(_("ウィザードモードに念を送り、死を欺いた。", "You invoke wizard mode and cheat death."));
+	msg_print(NULL);
+
+	(void)life_stream(FALSE, FALSE);
+
+	if (creature_ptr->pclass == CLASS_MAGIC_EATER)
+	{
+		int magic_idx;
+		for (magic_idx = 0; magic_idx < EATER_EXT * 2; magic_idx++)
+		{
+			creature_ptr->magic_num1[magic_idx] = creature_ptr->magic_num2[magic_idx] * EATER_CHARGE;
+		}
+		for (; magic_idx < EATER_EXT * 3; magic_idx++)
+		{
+			creature_ptr->magic_num1[magic_idx] = 0;
+		}
+	}
+
+	/* Restore spell points */
+	creature_ptr->csp = creature_ptr->msp;
+	creature_ptr->csp_frac = 0;
+
+	/* Hack -- cancel recall */
+	if (creature_ptr->word_recall)
+	{
+		msg_print(_("張りつめた大気が流れ去った...", "A tension leaves the air around you..."));
+		msg_print(NULL);
+
+		/* Hack -- Prevent recall */
+		creature_ptr->word_recall = 0;
+		creature_ptr->redraw |= (PR_STATUS);
+	}
+
+	/* Hack -- cancel alter */
+	if (creature_ptr->alter_reality)
+	{
+		/* Hack -- Prevent alter */
+		creature_ptr->alter_reality = 0;
+		creature_ptr->redraw |= (PR_STATUS);
+	}
+
+	/* Note cause of death */
+	(void)strcpy(creature_ptr->died_from, _("死の欺き", "Cheating death"));
+
+	/* Do not die */
+	creature_ptr->is_dead = FALSE;
+
+	/* Hack -- Prevent starvation */
+	(void)set_food(PY_FOOD_MAX - 1);
+
+	dun_level = 0;
+	creature_ptr->inside_arena = FALSE;
+	creature_ptr->inside_battle = FALSE;
+	leaving_quest = 0;
+	creature_ptr->inside_quest = 0;
+	if (dungeon_type) creature_ptr->recall_dungeon = dungeon_type;
+	dungeon_type = 0;
+	if (lite_town || vanilla_town)
+	{
+		creature_ptr->wilderness_y = 1;
+		creature_ptr->wilderness_x = 1;
+		if (vanilla_town)
+		{
+			creature_ptr->oldpy = 10;
+			creature_ptr->oldpx = 34;
+		}
+		else
+		{
+			creature_ptr->oldpy = 33;
+			creature_ptr->oldpx = 131;
+		}
+	}
+	else
+	{
+		creature_ptr->wilderness_y = 48;
+		creature_ptr->wilderness_x = 5;
+		creature_ptr->oldpy = 33;
+		creature_ptr->oldpx = 131;
+	}
+
+	/* Leaving */
+	creature_ptr->wild_mode = FALSE;
+	creature_ptr->leaving = TRUE;
+
+	do_cmd_write_nikki(NIKKI_BUNSHOU, 1,
+		_("                            しかし、生き返った。",
+			"                            but revived."));
+
+	/* Prepare next floor */
+	leave_floor();
+	wipe_m_list();
+
+}
+
 
 #else