Skip to content

Commit

Permalink
Fix: Sleeved cards could merge with non-sleeved cards of the same type.
Browse files Browse the repository at this point in the history
  • Loading branch information
elunna committed Nov 18, 2023
1 parent 17470b9 commit 05608bf
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/invent.c
Original file line number Diff line number Diff line change
Expand Up @@ -3975,7 +3975,8 @@ register struct obj *otmp, *obj;
return FALSE;

if (obj->oclass == SCROLL_CLASS
&& (obj->corpsenm != NON_PM && obj->corpsenm != otmp->corpsenm))
&& ((obj->corpsenm != NON_PM && obj->corpsenm != otmp->corpsenm)
|| (obj->oerodeproof != otmp->oerodeproof)))
return FALSE;

if (obj->dknown != otmp->dknown
Expand Down

0 comments on commit 05608bf

Please sign in to comment.