OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] #37353 monster_is_valid() 関数を定義し単純な !r_idx の条件から置換。 / Define monster_is_va...
[hengbandforosx/hengbandosx.git]
/
src
/
wizard2.c
diff --git
a/src/wizard2.c
b/src/wizard2.c
index
592589f
..
1313f4c
100644
(file)
--- a/
src/wizard2.c
+++ b/
src/wizard2.c
@@
-27,6
+27,7
@@
#include "spells-floor.h"
#include "object-hook.h"
#include "spells-floor.h"
#include "object-hook.h"
+#include "monster-status.h"
#ifdef ALLOW_WIZARD
#ifdef ALLOW_WIZARD
@@
-1475,7
+1476,7
@@
static void do_cmd_wiz_zap(void)
monster_type *m_ptr = ¤t_floor_ptr->m_list[i];
/* Paranoia -- Skip dead monsters */
monster_type *m_ptr = ¤t_floor_ptr->m_list[i];
/* Paranoia -- Skip dead monsters */
- if (!m
_ptr->r_idx
) continue;
+ if (!m
onster_is_valid(m_ptr)
) continue;
/* Skip the mount */
if (i == p_ptr->riding) 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 = ¤t_floor_ptr->m_list[i];
/* Paranoia -- Skip dead monsters */
monster_type *m_ptr = ¤t_floor_ptr->m_list[i];
/* Paranoia -- Skip dead monsters */
- if (!m
_ptr->r_idx
) continue;
+ if (!m
onster_is_valid(m_ptr)
) continue;
/* Skip the mount */
if (i == p_ptr->riding) continue;
/* Skip the mount */
if (i == p_ptr->riding) continue;