Fix: useup bug from being able to detect gems with scrolls of gold de…

…tection.
elunna · Sep 23, 2023 · eb31744 · eb31744
1 parent 2b720a0
commit eb31744
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/read.c b/src/read.c
@@ -2238,16 +2238,18 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
         break;
     case SCR_GOLD_DETECTION: {
         boolean failure;
+        if (!sobj)
+            break;
         if (confused || scursed) {
             failure = trap_detect(sobj, TRUE) != 0;
         } else {
             failure = gold_detect(sobj) != 0;
-            if (sobj->blessed && (object_detect(sobj, GEM_CLASS) == 0))
+            if (!failure && sobj && sobj->blessed 
+                  && (object_detect(sobj, GEM_CLASS) == 0))
                 failure = FALSE;
         }
         if (failure) {
             sobj = 0; /* failure: strange_feeling() -> useup() */
-            useup(sobj);
         }
         break;
     }