From 89896d751af70d4273d3f13342cb7240b9b27a37 Mon Sep 17 00:00:00 2001 From: Euphy Date: Thu, 9 Jan 2014 11:58:27 -0500 Subject: [PATCH] Card compounding window no longer appears if no slotted items are available. (Hercules 763102b) Signed-off-by: Euphy --- src/map/clif.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/map/clif.c b/src/map/clif.c index d9dbf29137..2e0479dc58 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5936,9 +5936,15 @@ void clif_use_card(struct map_session_data *sd,int idx) if( j == sd->inventory_data[i]->slot ) // No room continue; + if( sd->status.inventory[i].equip > 0 ) // Do not check items that are already equipped + continue; + WFIFOW(fd,4+c*2)=i+2; c++; } + + if( !c ) return; // no item is available for card insertion + WFIFOW(fd,2)=4+c*2; WFIFOSET(fd,WFIFOW(fd,2)); }