diff options
| author | Haruna <haru@dotalux.com> | 2014-04-19 22:37:54 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2014-04-19 22:37:54 +0200 |
| commit | 93584f7416164985220293b7c08fcc29c4d5060f (patch) | |
| tree | 2f2f533682e54dfe501ff4a470953e3a6bd2462f /src/map/pc.c | |
| parent | cebfdc692ef4a5897c69304f88e585f8f1272c7e (diff) | |
| parent | dd49dbc3e8d2033c0dddc80f1d5b3c8e6710a419 (diff) | |
| download | hercules-93584f7416164985220293b7c08fcc29c4d5060f.tar.gz hercules-93584f7416164985220293b7c08fcc29c4d5060f.tar.bz2 hercules-93584f7416164985220293b7c08fcc29c4d5060f.tar.xz hercules-93584f7416164985220293b7c08fcc29c4d5060f.zip | |
Merge pull request #272 from hemagx/master
Rewritten NSI_UNIQUE_ID system
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index c6bab4cfc..ba66bf7db 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3992,10 +3992,10 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount,e_l sd->inventory_data[i] = data; clif->additem(sd,i,amount,0); } -#ifdef NSI_UNIQUE_ID + if( !itemdb->isstackable2(data) && !item_data->unique_id ) - sd->status.inventory[i].unique_id = itemdb->unique_id(0,0); -#endif + sd->status.inventory[i].unique_id = itemdb->unique_id(sd); + logs->pick_pc(sd, log_type, amount, &sd->status.inventory[i],sd->inventory_data[i]); sd->weight += w; |