potion-from-sink and the corpsenm field
Change the code involved to use a new #define for the field, like other overloaded uses of corpsenm. Also remove one check for this field from potion.c: there are no blessed potions from sinks.
This commit is contained in:
10
src/potion.c
10
src/potion.c
@@ -666,12 +666,8 @@ peffects(otmp)
|
||||
pline("(But in fact it was mildly stale %s.)",
|
||||
fruitname(TRUE));
|
||||
if (!Role_if(PM_HEALER)) {
|
||||
if (otmp->corpsenm)
|
||||
losehp(1,
|
||||
"mildly contaminated tap water", KILLED_BY);
|
||||
else
|
||||
losehp(1,
|
||||
"mildly contaminated potion", KILLED_BY_AN);
|
||||
/* NB: blessed otmp->fromsink is not possible */
|
||||
losehp(1, "mildly contaminated potion", KILLED_BY_AN);
|
||||
}
|
||||
} else {
|
||||
if(Poison_resistance)
|
||||
@@ -690,7 +686,7 @@ peffects(otmp)
|
||||
TRUE);
|
||||
}
|
||||
if(!Poison_resistance) {
|
||||
if (otmp->corpsenm)
|
||||
if (otmp->fromsink)
|
||||
losehp(rnd(10)+5*!!(otmp->cursed),
|
||||
"contaminated tap water", KILLED_BY);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user