X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=1313f4c69ebf1e1af1b9ea5f09a5d0231c13d7b3;hb=ca9791b9ce0cdb46461adfa4b8cb82ba80bef520;hp=592589f270ebde495f47dad983fd10b6d00fbe1f;hpb=b852b2e2a0dce017f6d3283d5756927062bf39b9;p=hengbandforosx%2Fhengbandosx.git

diff --git a/src/wizard2.c b/src/wizard2.c
index 592589f27..1313f4c69 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -27,6 +27,7 @@
 #include "spells-floor.h"
 
 #include "object-hook.h"
+#include "monster-status.h"
 
 #ifdef ALLOW_WIZARD
 
@@ -1475,7 +1476,7 @@ static void do_cmd_wiz_zap(void)
 		monster_type *m_ptr = &current_floor_ptr->m_list[i];
 
 		/* Paranoia -- Skip dead monsters */
-		if (!m_ptr->r_idx) continue;
+		if (!monster_is_valid(m_ptr)) continue;
 
 		/* Skip the mount */
 		if (i == p_ptr->riding) continue;
@@ -1512,7 +1513,7 @@ static void do_cmd_wiz_zap_all(void)
 		monster_type *m_ptr = &current_floor_ptr->m_list[i];
 
 		/* Paranoia -- Skip dead monsters */
-		if (!m_ptr->r_idx) continue;
+		if (!monster_is_valid(m_ptr)) continue;
 
 		/* Skip the mount */
 		if (i == p_ptr->riding) continue;