summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-04-16 10:59:28 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-04-16 10:59:28 +0000
commit8351f729fe20aa7f58d9bf2f3d74a1a79167aefe (patch)
treef664eb634f914e6742f617a559c1a520eba374f2 /src/map/script.c
parenta3c3030b2ec08cde70b8d10759bd863834bd6a35 (diff)
downloadhercules-8351f729fe20aa7f58d9bf2f3d74a1a79167aefe.tar.gz
hercules-8351f729fe20aa7f58d9bf2f3d74a1a79167aefe.tar.bz2
hercules-8351f729fe20aa7f58d9bf2f3d74a1a79167aefe.tar.xz
hercules-8351f729fe20aa7f58d9bf2f3d74a1a79167aefe.zip
Fixed FailedRemoveCards still removing Armor Enchant (followed up to r14282)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14283 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c
index d18085a39..bdd6a5897 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9829,10 +9829,8 @@ BUILDIN_FUNC(failedremovecards)
item_tmp.id=0,item_tmp.nameid=sd->status.inventory[i].card[c];
item_tmp.equip=0,item_tmp.identify=1,item_tmp.refine=0;
item_tmp.attribute=0,item_tmp.expire_time=0;
- for (j = 0; j < sd->inventory_data[i]->slot; j++)
+ for (j = 0; j < MAX_SLOTS; j++)
item_tmp.card[j]=0;
- for (j = sd->inventory_data[i]->slot; j < MAX_SLOTS; j++)
- item_tmp.card[j]=sd->status.inventory[i].card[j];
//Logs items, got from (N)PC scripts [Lupus]
if(log_config.enable_logs&0x40)
@@ -9866,8 +9864,10 @@ BUILDIN_FUNC(failedremovecards)
if(log_config.enable_logs&0x40)
log_pick_pc(sd, "N", sd->status.inventory[i].nameid, -1, &sd->status.inventory[i]);
- for (j = 0; j < MAX_SLOTS; j++)
+ for (j = 0; j < sd->inventory_data[i]->slot; j++)
item_tmp.card[j]=0;
+ for (j = sd->inventory_data[i]->slot; j < MAX_SLOTS; j++)
+ item_tmp.card[j]=sd->status.inventory[i].card[j];
pc_delitem(sd,i,1,0);
//Logs items, got from (N)PC scripts [Lupus]