a couple more monst food bits
Fix misleading indentation that the polyfood() macro inherited from the misformated polyfodder() macro. Fix a case where a non-pet monster would avoid eating a cockatrice corpse but would eat Medusa's corpse.
This commit is contained in:
+1
-1
@@ -309,7 +309,7 @@ struct obj {
|
|||||||
#define polyfood(obj) \
|
#define polyfood(obj) \
|
||||||
(ofood(obj) && (obj)->corpsenm >= LOW_PM \
|
(ofood(obj) && (obj)->corpsenm >= LOW_PM \
|
||||||
&& (pm_to_cham((obj)->corpsenm) != NON_PM \
|
&& (pm_to_cham((obj)->corpsenm) != NON_PM \
|
||||||
|| dmgtype(&mons[(obj)->corpsenm], AD_POLY)))
|
|| dmgtype(&mons[(obj)->corpsenm], AD_POLY)))
|
||||||
#define mlevelgain(obj) (ofood(obj) && (obj)->corpsenm == PM_WRAITH)
|
#define mlevelgain(obj) (ofood(obj) && (obj)->corpsenm == PM_WRAITH)
|
||||||
#define mhealup(obj) (ofood(obj) && (obj)->corpsenm == PM_NURSE)
|
#define mhealup(obj) (ofood(obj) && (obj)->corpsenm == PM_NURSE)
|
||||||
#define Is_pudding(o) \
|
#define Is_pudding(o) \
|
||||||
|
|||||||
@@ -1632,7 +1632,7 @@ meatcorpse(
|
|||||||
/* skip some corpses */
|
/* skip some corpses */
|
||||||
if (vegan(corpsepm) /* ignore veggy corpse even if omnivorous */
|
if (vegan(corpsepm) /* ignore veggy corpse even if omnivorous */
|
||||||
/* don't eat harmful corpses */
|
/* don't eat harmful corpses */
|
||||||
|| (touch_petrifies(corpsepm) && !resists_ston(mtmp)))
|
|| (flesh_petrifies(corpsepm) && !resists_ston(mtmp)))
|
||||||
continue;
|
continue;
|
||||||
if (is_rider(corpsepm)) {
|
if (is_rider(corpsepm)) {
|
||||||
boolean revived_it = revive_corpse(otmp);
|
boolean revived_it = revive_corpse(otmp);
|
||||||
|
|||||||
Reference in New Issue
Block a user