From 103ee947ff26aa850420f28271d0c931d83293f7 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 10 Oct 2016 13:13:23 +0200 Subject: [PATCH] Follow up to f0dd764 Fixed compile/merge errors from 5a56210 --- src/map/script.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/map/script.c b/src/map/script.c index eba38fa00e..a249239035 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12711,9 +12711,9 @@ BUILDIN_FUNC(successremovecards) { item_tmp.card[j]=sd->inventory.u.items_inventory[i].card[j]; for (j = 0; j < MAX_ITEM_RDM_OPT; j++){ - item_tmp.option[j].id=sd->status.inventory[i].option[j].id; - item_tmp.option[j].value=sd->status.inventory[i].option[j].value; - item_tmp.option[j].param=sd->status.inventory[i].option[j].param; + item_tmp.option[j].id=sd->inventory.u.items_inventory[i].option[j].id; + item_tmp.option[j].value=sd->inventory.u.items_inventory[i].option[j].value; + item_tmp.option[j].param=sd->inventory.u.items_inventory[i].option[j].param; } pc_delitem(sd,i,1,0,3,LOG_TYPE_SCRIPT); @@ -12790,9 +12790,9 @@ BUILDIN_FUNC(failedremovecards) { item_tmp.card[j]=sd->inventory.u.items_inventory[i].card[j]; for (j = 0; j < MAX_ITEM_RDM_OPT; j++){ - item_tmp.option[j].id=sd->status.inventory[i].option[j].id; - item_tmp.option[j].value=sd->status.inventory[i].option[j].value; - item_tmp.option[j].param=sd->status.inventory[i].option[j].param; + item_tmp.option[j].id=sd->inventory.u.items_inventory[i].option[j].id; + item_tmp.option[j].value=sd->inventory.u.items_inventory[i].option[j].value; + item_tmp.option[j].param=sd->inventory.u.items_inventory[i].option[j].param; } pc_delitem(sd,i,1,0,2,LOG_TYPE_SCRIPT);