summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorIbrahim Hossam <ibrahem.h.basyone@gmail.com>2014-04-08 20:40:12 +0200
committerIbrahim Hossam <ibrahem.h.basyone@gmail.com>2014-04-18 09:58:42 +0200
commitdd49dbc3e8d2033c0dddc80f1d5b3c8e6710a419 (patch)
tree219025c6ac65f2cf72798a45c926507633f3446f /src/map/pc.c
parent47680829048288376aec23102b9660f36f4463ee (diff)
downloadhercules-dd49dbc3e8d2033c0dddc80f1d5b3c8e6710a419.tar.gz
hercules-dd49dbc3e8d2033c0dddc80f1d5b3c8e6710a419.tar.bz2
hercules-dd49dbc3e8d2033c0dddc80f1d5b3c8e6710a419.tar.xz
hercules-dd49dbc3e8d2033c0dddc80f1d5b3c8e6710a419.zip
Rewritten NSI_UNIQUE_ID system to get rid of the cross-database interreg dependency
- Removes the need for map-server to access the interreg table to store the last used ID. - Login, char and map databases can now be hosted separately. - Note: the unique_id structure has changed, and it now contains the generator character ID in its upper 32 bits. - Now NSI_UNIQUE_ID System is enabled always Special thanks to Haruna.
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 42b79ed92..f5327e0bd 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3991,10 +3991,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;