Skip to content

Commit

Permalink
Petrification by swallowing a cockatrice whole now violates foodless …
Browse files Browse the repository at this point in the history
…conduct. On the assumption that C343-134 refers to the absence rather than presence of this behaviour, it is now fixed.
  • Loading branch information
sgrunt committed Apr 20, 2012
1 parent c7c7a65 commit a65cf62
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/uhitm.c
Expand Up @@ -2039,6 +2039,15 @@ register struct attack *mattk;
for (otmp = mdef->minvent; otmp; otmp = otmp->nobj)
(void) snuff_lit(otmp);

/* KMH, conduct */
if (mattk->adtyp == AD_DGST) {
u.uconduct.food++;
if (!vegan(mdef->data))
u.uconduct.unvegan++;
if (!vegetarian(mdef->data))
violated_vegetarian();
}

if(!touch_petrifies(mdef->data) || Stone_resistance) {
#ifdef LINT /* static char msgbuf[BUFSZ]; */
char msgbuf[BUFSZ];
Expand All @@ -2065,13 +2074,6 @@ register struct attack *mattk;
break;
}

/* KMH, conduct */
u.uconduct.food++;
if (!vegan(mdef->data))
u.uconduct.unvegan++;
if (!vegetarian(mdef->data))
violated_vegetarian();

/* Use up amulet of life saving */
if (!!(otmp = mlifesaver(mdef))) m_useup(mdef, otmp);

Expand Down

0 comments on commit a65cf62

Please sign in to comment.