From 03b0cec7dd940e577954dd63655958c600247c1d Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Thu, 16 Nov 2023 00:17:43 +0100 Subject: [PATCH] Fix: Summon cards were merging incorrectly with other cards. This was bug was also present in SpliceHack (https://github.com/NullCGT/SpliceHack/issues/232). --- src/invent.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/invent.c b/src/invent.c index 1f30bcc60..7bbaf3fa6 100644 --- a/src/invent.c +++ b/src/invent.c @@ -3972,6 +3972,10 @@ register struct obj *otmp, *obj; && (obj->oeaten != otmp->oeaten || obj->orotten != otmp->orotten)) return FALSE; + if (obj->oclass == SCROLL_CLASS + && (obj->corpsenm != NON_PM && obj->corpsenm != otmp->corpsenm)) + return FALSE; + if (obj->dknown != otmp->dknown || (obj->bknown != otmp->bknown && !Role_if(PM_PRIEST)) || obj->oeroded != otmp->oeroded