From 02afe4bb98bb01bf52781a5673b190cb1c491810 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 2 Mar 2006 13:49:18 +0000 Subject: - Fixed item pickup not picking anything unless you were in a party with item distribution set o.O git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5423 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 7d4a75e0c..0be77386f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2591,16 +2591,12 @@ int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem) } } first_sd = NULL; //First_sd will store who picked up the item. - if (p && p->item&2) { //item distribution to party members. - if ((flag = party_share_loot(p,sd,&fitem->item_data))) { - clif_additem(sd,0,0,flag); - return 1; - } - first_sd = sd; - } else - if(log_config.pick) //Logs items, taken by (P)layers [Lupus] - log_pick(first_sd, "P", 0, fitem->item_data.nameid, fitem->item_data.amount, (struct item*)&fitem->item_data); - + //This function takes care of giving the item to whoever should have it + //considering party-share options. + if ((flag = party_share_loot(p,sd,&fitem->item_data))) { + clif_additem(sd,0,0,flag); + return 1; + } //Display pickup animation. if(sd->attacktimer != -1) -- cgit v1.2.3-70-g09d2