Merge remote-tracking branch 'origin/NetHack-3.6.0'
This commit is contained in:
@@ -1674,9 +1674,11 @@ struct obj *otmp;
|
|||||||
&& herbivorous(youmonst.data))
|
&& herbivorous(youmonst.data))
|
||||||
: (carnivorous(youmonst.data)
|
: (carnivorous(youmonst.data)
|
||||||
&& !herbivorous(youmonst.data))),
|
&& !herbivorous(youmonst.data))),
|
||||||
palatable = (vegetarian(&mons[mnum])
|
palatable = ((vegetarian(&mons[mnum])
|
||||||
? herbivorous(youmonst.data)
|
? herbivorous(youmonst.data)
|
||||||
: carnivorous(youmonst.data));
|
: carnivorous(youmonst.data))
|
||||||
|
&& rn2(10)
|
||||||
|
&& ((rotted < 1) ? TRUE : !rn2(rotted+1)));
|
||||||
const char *pmxnam = food_xname(otmp, FALSE);
|
const char *pmxnam = food_xname(otmp, FALSE);
|
||||||
|
|
||||||
if (!strncmpi(pmxnam, "the ", 4))
|
if (!strncmpi(pmxnam, "the ", 4))
|
||||||
|
|||||||
Reference in New Issue
Block a user