X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=f94fd984ad5ce6c1cd5d1169391f7d6d69df6d9e;hb=9d4b877c27a36774ae5256db6237264298837607;hp=8e939a5a590b7ff0ecdfe22c5a7b41a214e7fac1;hpb=f1bf5901b99893d7ce556a55ae29fb9f98b4943f;p=hengband%2Fhengband.git

diff --git a/src/wizard2.c b/src/wizard2.c
index 8e939a5a5..f94fd984a 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -31,7 +31,7 @@ void do_cmd_rerate_aux(void)
 	while (1)
 	{
 		/* Pre-calculate level 1 hitdice */
-		p_ptr->player_hp[0] = p_ptr->hitdie;
+		p_ptr->player_hp[0] = (HIT_POINT)p_ptr->hitdie;
 
 		for (i = 1; i < 4; i++)
 		{
@@ -100,13 +100,40 @@ void do_cmd_rerate(bool display)
  */
 static bool wiz_dimension_door(void)
 {
-	int	x = 0, y = 0;
-
+	POSITION x = 0, y = 0;
 	if (!tgt_pt(&x, &y)) return FALSE;
-
 	teleport_player_to(y, x, TELEPORT_NONMAGICAL);
+	return (TRUE);
+}
+
 
+/*!
+ * @brief プレイ日数を変更する / Set gametime.
+ * @return 実際に変更を行ったらTRUEを返す
+ */
+static bool set_gametime(void)
+{
+	int tmp_int = 0;
+	char ppp[80], tmp_val[40];
+
+	/* Prompt */
+	sprintf(ppp, "Dungeon Turn (0-%ld): ", dungeon_turn_limit);
+
+	/* Default */
+	sprintf(tmp_val, "%ld", dungeon_turn);
+
+	/* Query */
+	if (!get_string(ppp, tmp_val, 10)) return (FALSE);
+
+	/* Extract */
+	tmp_int = atoi(tmp_val);
+
+	/* Verify */
+	if (tmp_int >= dungeon_turn_limit) tmp_int = dungeon_turn_limit - 1;
+	else if (tmp_int < 0) tmp_int = 0;
+	dungeon_turn = turn = tmp_int;
 	return (TRUE);
+
 }
 
 
@@ -128,7 +155,7 @@ static void wiz_create_named_art(void)
 	if(a_idx >= max_a_idx) a_idx = 0; 
 
 	/* Create the artifact */
-	(void)create_named_art(a_idx, py, px);
+	(void)create_named_art(a_idx, p_ptr->y, p_ptr->x);
 
 	/* All done */
 	msg_print("Allocated.");
@@ -155,12 +182,12 @@ static void do_cmd_wiz_hack_ben(void)
  */
 static void do_cmd_summon_horde(void)
 {
-	int wy = py, wx = px;
+	POSITION wy = p_ptr->y, wx = p_ptr->x;
 	int attempts = 1000;
 
 	while (--attempts)
 	{
-		scatter(&wy, &wx, py, px, 3, 0);
+		scatter(&wy, &wx, p_ptr->y, p_ptr->x, 3, 0);
 		if (cave_empty_bold(wy, wx)) break;
 	}
 
@@ -206,14 +233,13 @@ 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_POSITION row, TERM_POSITION col)
 {
 	int i, j;
 	int home = 0;
 	u32b rarity[K_MAX_DEPTH];
 	u32b total[K_MAX_DEPTH];
-	s32b maxd = 1, display[22];
-	byte c = TERM_WHITE;
+	s32b display[22];
 	cptr r = "+---Rate---+";
 	object_kind *k_ptr;
 
@@ -320,7 +346,7 @@ static void do_cmd_wiz_reset_class(void)
 	if (tmp_int < 0 || tmp_int >= MAX_CLASS) return;
 
 	/* Save it */
-	p_ptr->pclass = tmp_int;
+	p_ptr->pclass = (byte_hack)tmp_int;
 
 	/* Redraw inscription */
 	p_ptr->window |= (PW_PLAYER);
@@ -381,7 +407,7 @@ static void do_cmd_wiz_change_aux(void)
 		else if (tmp_int < 3) tmp_int = 3;
 
 		/* Save it */
-		p_ptr->stat_cur[i] = p_ptr->stat_max[i] = tmp_int;
+		p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (s16b)tmp_int;
 	}
 
 
@@ -392,7 +418,7 @@ static void do_cmd_wiz_change_aux(void)
 	if (!get_string(_("熟練度: ", "Proficiency: "), tmp_val, 9)) return;
 
 	/* Extract */
-	tmp_s16b = atoi(tmp_val);
+	tmp_s16b = (s16b)atoi(tmp_val);
 
 	/* Verify */
 	if (tmp_s16b < WEAPON_EXP_UNSKILLED) tmp_s16b = WEAPON_EXP_UNSKILLED;
@@ -684,7 +710,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;
 
@@ -719,11 +745,11 @@ 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 IDX wiz_create_itemtype(void)
 {
 	int i, num, max_num;
 	int col, row;
-	int tval;
+	OBJECT_TYPE_VALUE tval;
 
 	cptr tval_desc;
 	char ch;
@@ -831,25 +857,25 @@ static void wiz_tweak_item(object_type *o_ptr)
 	p = "Enter new 'pval' setting: ";
 	sprintf(tmp_val, "%d", o_ptr->pval);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->pval = atoi(tmp_val);
+	o_ptr->pval = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 
 	p = "Enter new 'to_a' setting: ";
 	sprintf(tmp_val, "%d", o_ptr->to_a);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->to_a = atoi(tmp_val);
+	o_ptr->to_a = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 
 	p = "Enter new 'to_h' setting: ";
 	sprintf(tmp_val, "%d", o_ptr->to_h);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->to_h = atoi(tmp_val);
+	o_ptr->to_h = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 
 	p = "Enter new 'to_d' setting: ";
-	sprintf(tmp_val, "%d", o_ptr->to_d);
+	sprintf(tmp_val, "%d", (int)o_ptr->to_d);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->to_d = atoi(tmp_val);
+	o_ptr->to_d = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 }
 
@@ -1179,7 +1205,7 @@ static void wiz_quantity_item(object_type *o_ptr)
 	tmp_qnt = o_ptr->number;
 
 	/* Default */
-	sprintf(tmp_val, "%d", o_ptr->number);
+	sprintf(tmp_val, "%d", (int)o_ptr->number);
 
 	/* Query */
 	if (get_string("Quantity: ", tmp_val, 2))
@@ -1192,7 +1218,7 @@ static void wiz_quantity_item(object_type *o_ptr)
 		if (tmp_int > 99) tmp_int = 99;
 
 		/* Accept modifications */
-		o_ptr->number = tmp_int;
+		o_ptr->number = (byte_hack)tmp_int;
 	}
 
 	if (o_ptr->tval == TV_ROD)
@@ -1234,16 +1260,19 @@ static void do_cmd_wiz_blue_mage(void)
 }
 
 
-/*
+/*!
+ * @brief アイテム検査のメインルーチン /
  * Play with an item. Options include:
- *   - Output statistics (via wiz_roll_item)
- *   - Reroll item (via wiz_reroll_item)
- *   - Change properties (via wiz_tweak_item)
- *   - Change the number of items (via wiz_quantity_item)
+ * @return なし
+ * @details 
+ *   - Output statistics (via wiz_roll_item)<br>
+ *   - Reroll item (via wiz_reroll_item)<br>
+ *   - Change properties (via wiz_tweak_item)<br>
+ *   - Change the number of items (via wiz_quantity_item)<br>
  */
 static void do_cmd_wiz_play(void)
 {
-	int item;
+	OBJECT_IDX item;
 
 	object_type	forge;
 	object_type *q_ptr;
@@ -1369,8 +1398,11 @@ static void do_cmd_wiz_play(void)
 }
 
 
-/*
+/*!
+ * @brief 任意のベースアイテム生成のメインルーチン /
  * Wizard routine for creating objects		-RAK-
+ * @return なし
+ * @details
  * Heavily modified to allow magification and artifactification  -Bernd-
  *
  * Note that wizards cannot create objects on top of other objects.
@@ -1383,8 +1415,7 @@ static void wiz_create_item(void)
 	object_type	forge;
 	object_type *q_ptr;
 
-	int k_idx;
-
+	IDX k_idx;
 
 	/* Save the screen */
 	screen_save();
@@ -1395,7 +1426,6 @@ static void wiz_create_item(void)
 	/* Restore the screen */
 	screen_load();
 
-
 	/* Return if failed */
 	if (!k_idx) return;
 
@@ -1413,7 +1443,7 @@ static void wiz_create_item(void)
 			if (a_info[i].sval != k_info[k_idx].sval) continue;
 
 			/* Create this artifact */
-			(void)create_named_art(i, py, px);
+			(void)create_named_art(i, p_ptr->y, p_ptr->x);
 
 			/* All done */
 			msg_print("Allocated(INSTA_ART).");
@@ -1432,15 +1462,17 @@ static void wiz_create_item(void)
 	apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
 
 	/* Drop the object from heaven */
-	(void)drop_near(q_ptr, -1, py, px);
+	(void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
 
 	/* All done */
 	msg_print("Allocated.");
 }
 
 
-/*
+/*!
+ * @brief プレイヤーを完全回復する /
  * Cure everything instantly
+ * @return なし
  */
 static void do_cmd_wiz_cure_all(void)
 {
@@ -1495,8 +1527,10 @@ static void do_cmd_wiz_cure_all(void)
 }
 
 
-/*
+/*!
+ * @brief 任意のダンジョン及び階層に飛ぶ /
  * Go to any level
+ * @return なし
  */
 static void do_cmd_wiz_jump(void)
 {
@@ -1521,18 +1555,19 @@ static void do_cmd_wiz_jump(void)
 		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", dun_level);
+		sprintf(tmp_val, "%d", (int)dun_level);
 
 		/* Ask for a level */
 		if (!get_string(ppp, tmp_val, 10)) return;
 
 		/* Extract request */
-		command_arg = atoi(tmp_val);
+		command_arg = (s16b)atoi(tmp_val);
 
-		dungeon_type = tmp_dungeon_type;
+		dungeon_type = (byte_hack)tmp_dungeon_type;
 	}
 
 	/* Paranoia */
@@ -1560,7 +1595,7 @@ static void do_cmd_wiz_jump(void)
 	if (record_stair) do_cmd_write_nikki(NIKKI_WIZ_TELE,0,NULL);
 
 	p_ptr->inside_quest = 0;
-	energy_use = 0;
+	p_ptr->energy_use = 0;
 
 	/* Prevent energy_need from being too lower than 0 */
 	p_ptr->energy_need = 0;
@@ -1576,12 +1611,14 @@ static void do_cmd_wiz_jump(void)
 }
 
 
-/*
+/*!
+ * @brief 全ベースアイテムを鑑定済みにする /
  * Become aware of a lot of objects
+ * @return なし
  */
 static void do_cmd_wiz_learn(void)
 {
-	int i;
+	IDX i;
 
 	object_type forge;
 	object_type *q_ptr;
@@ -1607,8 +1644,11 @@ static void do_cmd_wiz_learn(void)
 }
 
 
-/*
+/*!
+ * @brief 現在のフロアに合ったモンスターをランダムに召喚する /
  * Summon some creatures
+ * @param num 生成処理回数
+ * @return なし
  */
 static void do_cmd_wiz_summon(int num)
 {
@@ -1616,40 +1656,49 @@ static void do_cmd_wiz_summon(int num)
 
 	for (i = 0; i < num; i++)
 	{
-		(void)summon_specific(0, py, px, 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));
 	}
 }
 
 
-/*
+
+/*!
+ * @brief モンスターを種族IDを指定して敵対的に召喚する /
  * Summon a creature of the specified type
- *
+ * @param r_idx モンスター種族ID
+ * @return なし
+ * @details
  * XXX XXX XXX 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, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
+	(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
 }
 
 
-/*
+/*!
+ * @brief モンスターを種族IDを指定してペット召喚する /
  * Summon a creature of the specified type
- *
+ * @param r_idx モンスター種族ID
+ * @return なし
+ * @details
  * XXX XXX XXX 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, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
+	(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
 }
 
 
 
-/*
+/*!
+ * @brief プレイヤー近辺の全モンスターを消去する /
  * Hack -- Delete all nearby monsters
+ * @return なし
  */
 static void do_cmd_wiz_zap(void)
 {
-	int i;
+	MONSTER_IDX i;
 
 
 	/* Genocide everyone nearby */
@@ -1680,12 +1729,14 @@ static void do_cmd_wiz_zap(void)
 }
 
 
-/*
+/*!
+ * @brief フロアに存在する全モンスターを消去する /
  * Hack -- Delete all monsters
+ * @return なし
  */
 static void do_cmd_wiz_zap_all(void)
 {
-	int i;
+	MONSTER_IDX i;
 
 	/* Genocide everyone */
 	for (i = 1; i < m_max; i++)
@@ -1712,8 +1763,10 @@ static void do_cmd_wiz_zap_all(void)
 }
 
 
-/*
+/*!
+ * @brief 指定された地点の地形IDを変更する /
  * Create desired feature
+ * @return なし
  */
 static void do_cmd_wiz_create_feature(void)
 {
@@ -1722,8 +1775,8 @@ static void do_cmd_wiz_create_feature(void)
 	cave_type    *c_ptr;
 	feature_type *f_ptr;
 	char         tmp_val[160];
-	int          tmp_feat, tmp_mimic;
-	int          y, x;
+	IDX          tmp_feat, tmp_mimic;
+	POSITION y, x;
 
 	if (!tgt_pt(&x, &y)) return;
 
@@ -1736,7 +1789,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;
 
@@ -1747,12 +1800,12 @@ 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;
 
 	cave_set_feat(y, x, tmp_feat);
-	c_ptr->mimic = tmp_mimic;
+	c_ptr->mimic = (s16b)tmp_mimic;
 
 	f_ptr = &f_info[get_feat_mimic(c_ptr)];
 
@@ -1779,8 +1832,10 @@ static void do_cmd_wiz_create_feature(void)
 #define NUM_O_SET 8
 #define NUM_O_BIT 32
 
-/*
+/*!
+ * @brief 現在のオプション設定をダンプ出力する /
  * Hack -- Dump option bits usage
+ * @return なし
  */
 static void do_cmd_dump_options(void)
 {
@@ -1871,16 +1926,17 @@ extern void do_cmd_debug(void);
 
 
 
-/*
+/*!
+ * @brief デバッグコマンドを選択する処理のメインルーチン /
  * Ask for and parse a "debug command"
  * The "command_arg" may have been set.
+ * @return なし
  */
 void do_cmd_debug(void)
 {
 	int     x, y;
 	char    cmd;
 
-
 	/* Get a "debug command" */
 	get_com("Debug Command: ", &cmd, FALSE);
 
@@ -1973,7 +2029,7 @@ void do_cmd_debug(void)
 	/* Good Objects */
 	case 'g':
 		if (command_arg <= 0) command_arg = 1;
-		acquirement(py, px, command_arg, FALSE, FALSE, TRUE);
+		acquirement(p_ptr->y, p_ptr->x, command_arg, FALSE, FALSE, TRUE);
 		break;
 
 	/* Hitpoint rerating */
@@ -2052,26 +2108,22 @@ void do_cmd_debug(void)
 		teleport_player(10, 0L);
 		break;
 
-#if 0
 	/* Complete a Quest -KMW- */
 	case 'q':
-		for (i = 0; i < max_quests; i++)
+		if(p_ptr->inside_quest)
 		{
-			if (p_ptr->quest[i].status == QUEST_STATUS_TAKEN)
+			if (quest[p_ptr->inside_quest].status == QUEST_STATUS_TAKEN)
 			{
-				p_ptr->quest[i].status++;
-				msg_print("Completed Quest");
-				msg_print(NULL);
+				complete_quest(p_ptr->inside_quest);
 				break;
 			}
 		}
-		if (i == max_quests)
+		else
 		{
 			msg_print("No current quest");
 			msg_print(NULL);
 		}
 		break;
-#endif
 
 	/* Make every dungeon square "known" to test streamers -KMW- */
 	case 'u':
@@ -2094,7 +2146,7 @@ void do_cmd_debug(void)
 	/* Special(Random Artifact) Objects */
 	case 'S':
 		if (command_arg <= 0) command_arg = 1;
-		acquirement(py, px, command_arg, TRUE, TRUE, TRUE);
+		acquirement(p_ptr->y, p_ptr->x, command_arg, TRUE, TRUE, TRUE);
 		break;
 
 	/* Teleport */
@@ -2102,10 +2154,16 @@ void do_cmd_debug(void)
 		teleport_player(100, 0L);
 		break;
 
+	/* Game Time Setting */
+	case 'T':
+		set_gametime();
+		break;
+
+
 	/* Very Good Objects */
 	case 'v':
 		if (command_arg <= 0) command_arg = 1;
-		acquirement(py, px, command_arg, TRUE, FALSE, TRUE);
+		acquirement(p_ptr->y, p_ptr->x, command_arg, TRUE, FALSE, TRUE);
 		break;
 
 	/* Wizard Light the Level */