Revert "remove mon guard from _see_with_infrared(mon),_is_safemon(mon)"
This reverts commit 91fdc1104a while an
issue is investigated further..
This commit is contained in:
+2
-2
@@ -104,7 +104,7 @@
|
|||||||
* canseemon() or canspotmon() which already check that.
|
* canseemon() or canspotmon() which already check that.
|
||||||
*/
|
*/
|
||||||
#define _see_with_infrared(mon) \
|
#define _see_with_infrared(mon) \
|
||||||
(!Blind && Infravision && infravisible(mon->data) \
|
(!Blind && Infravision && mon && infravisible(mon->data) \
|
||||||
&& couldsee(mon->mx, mon->my))
|
&& couldsee(mon->mx, mon->my))
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -157,7 +157,7 @@
|
|||||||
* definition here is convenient. No longer limited to pets.
|
* definition here is convenient. No longer limited to pets.
|
||||||
*/
|
*/
|
||||||
#define _is_safemon(mon) \
|
#define _is_safemon(mon) \
|
||||||
(flags.safe_dog && (mon)->mpeaceful && canspotmon(mon) \
|
(flags.safe_dog && (mon) && (mon)->mpeaceful && canspotmon(mon) \
|
||||||
&& !Confusion && !Hallucination && !Stunned)
|
&& !Confusion && !Hallucination && !Stunned)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user