Fix: Players could not sacrifice the Eye of the Beholder or the Hand …

…of Vecna (reported by Loggers_VIII). Fixes #478.
elunna · Oct 3, 2023 · 7410f35 · 7410f35
1 parent 22b9ed5
commit 7410f35
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/include/extern.h b/include/extern.h
@@ -778,6 +778,7 @@ E void NDECL(reset_faint);
 E void NDECL(violated_vegetarian);
 E void FDECL(newuhs, (BOOLEAN_P));
 E struct obj *FDECL(floorfood, (const char *, int));
+E boolean FDECL(can_sacrifice, (int));
 E void NDECL(vomit);
 E int FDECL(eaten_stat, (int, struct obj *));
 E void FDECL(food_disappears, (struct obj *));

diff --git a/src/eat.c b/src/eat.c
@@ -3212,7 +3212,6 @@ doeat()
             nodelicious = TRUE;
         else if (otmp->otyp == EYEBALL || otmp->otyp == SEVERED_HAND)
             nodelicious = TRUE;
-
         if (otmp->oclass == WEAPON_CLASS && otmp->opoisoned) {
             pline("Ecch - that must have been poisonous!");
             if (how_resistant(POISON_RES) < 100) {
@@ -3826,7 +3825,7 @@ int corpsecheck; /* 0, no check, 1, corpses, 2, tinnable corpses */
     /* Is there some food (probably a heavy corpse) here on the ground? */
     for (otmp = level.objects[u.ux][u.uy]; otmp; otmp = otmp->nexthere) {
         if (corpsecheck
-                ? (otmp->otyp == CORPSE
+                ? (can_sacrifice(otmp->otyp)
                    && (corpsecheck == 1 || tinnable(otmp)))
                 : feeding ? (otmp->oclass != COIN_CLASS && is_edible(otmp))
                           : otmp->oclass == FOOD_CLASS) {
@@ -3863,13 +3862,21 @@ int corpsecheck; /* 0, no check, 1, corpses, 2, tinnable corpses */
     otmp = getobj(feeding ? allobj : offering ? offerfodder : comestibles,
                   verb);
     if (corpsecheck && otmp && !(offering && otmp->oclass == AMULET_CLASS))
-        if (otmp->otyp != CORPSE || (corpsecheck == 2 && !tinnable(otmp))) {
+        if (!can_sacrifice(otmp->otyp)
+             || (corpsecheck == 2 && !tinnable(otmp))) {
             You_cant("%s that!", verb);
             return (struct obj *) 0;
         }
     return otmp;
 }
 
+boolean
+can_sacrifice(otyp)
+int otyp;
+{
+    return (otyp == CORPSE || otyp != EYEBALL || otyp != SEVERED_HAND);
+}
+
 /* Side effects of vomiting */
 /* added nomul (MRS) - it makes sense, you're too busy being sick! */
 void

diff --git a/src/invent.c b/src/invent.c
@@ -1701,8 +1701,8 @@ register const char *let, *word;
                  && (otmp->oclass == TOOL_CLASS && otyp != KEG))
              || (!strcmp(word, "eat") && !is_edible(otmp))
              || (!strcmp(word, "sacrifice")
-                 && (otyp != CORPSE && otyp != AMULET_OF_YENDOR
-                     && otyp != FAKE_AMULET_OF_YENDOR))
+                 && (!can_sacrifice(otmp->otyp)
+                 && otyp != AMULET_OF_YENDOR && otyp != FAKE_AMULET_OF_YENDOR))
              || (!strcmp(word, "write with")
                  && (otmp->oclass == TOOL_CLASS
                      && otyp != MAGIC_MARKER && otyp != TOWEL)

diff --git a/src/pray.c b/src/pray.c
@@ -1779,7 +1779,8 @@ dosacrifice()
 #define MAXVALUE 24 /* Highest corpse value (besides Wiz) */
 
     /* sacrificing the Eye of the Beholder is a special case */
-    if (otmp->oartifact == ART_EYE_OF_THE_BEHOLDER) {
+    if (otmp->oartifact == ART_EYE_OF_THE_BEHOLDER 
+          || otmp->oartifact == ART_HAND_OF_VECNA) {
         You("offer this abomination to %s...", a_gname());
         value = MAXVALUE; /* woop */
         /* KMH, conduct */