X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=0a01936cb55afe39de4e7f13ed89bf8e3e005162;hb=53ee2a21668383644dd58375dbc4d48b532f9dd8;hp=b998c35a78513a2151d98bbf8bd68d2ad6d7219f;hpb=cf6a1b623cdaaa83385b78630a9f1ab993768e67;p=hengband%2Fhengband.git

diff --git a/src/wizard2.c b/src/wizard2.c
index b998c35a7..0a01936cb 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -121,7 +121,7 @@ static bool wiz_dimension_door(void)
 static void wiz_create_named_art(int a_idx)
 {
 	/* Create the artifact */
-	create_named_art(a_idx, py, px);
+	(void)create_named_art(a_idx, py, px);
 
 	/* All done */
 	msg_print("Allocated.");
@@ -654,6 +654,7 @@ static tval_desc tvals[] =
 	{ TV_CRUSADE_BOOK,      "Crusade Spellbook"},
 	{ TV_MUSIC_BOOK,        "Music Spellbook"      },
 	{ TV_HISSATSU_BOOK,     "Book of Kendo" },
+	{ TV_HEX_BOOK,          "Hex Spellbook"        },
 	{ TV_PARCHMENT,         "Parchment" },
 	{ TV_WHISTLE,           "Whistle"	},
 	{ TV_SPIKE,             "Spikes"               },
@@ -1390,7 +1391,7 @@ static void wiz_create_item(void)
 			if (a_info[i].sval != k_info[k_idx].sval) continue;
 
 			/* Create this artifact */
-			create_named_art(i, py, px);
+			(void)create_named_art(i, py, px);
 
 			/* All done */
 			msg_print("Allocated(INSTA_ART).");
@@ -1643,6 +1644,14 @@ static void do_cmd_wiz_zap(void)
 		/* Delete nearby monsters */
 		if (m_ptr->cdis <= MAX_SIGHT)
 		{
+			if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
+			{
+				char m_name[80];
+
+				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+			}
+
 			delete_monster_idx(i);
 		}
 	}
@@ -1667,6 +1676,14 @@ static void do_cmd_wiz_zap_all(void)
 		/* Skip the mount */
 		if (i == p_ptr->riding) continue;
 
+		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
+		{
+			char m_name[80];
+
+			monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+			do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+		}
+
 		/* Delete this monster */
 		delete_monster_idx(i);
 	}
@@ -1678,8 +1695,8 @@ static void do_cmd_wiz_zap_all(void)
  */
 static void do_cmd_wiz_create_feature(void)
 {
-	static int   prev_feat = FEAT_NONE;
-	static int   prev_mimic = FEAT_NONE;
+	static int   prev_feat = 0;
+	static int   prev_mimic = 0;
 	cave_type    *c_ptr;
 	feature_type *f_ptr;
 	char         tmp_val[160];