summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-12 17:15:05 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-12 17:15:05 +0000
commit33600602dad4660319af2949e18735f5028b1b78 (patch)
tree264e9dbd0ece9ef996f4ebbdfae62d9499af530e
parent7cb754bd58080d432473503230cae76ed4979041 (diff)
downloadhercules-33600602dad4660319af2949e18735f5028b1b78.tar.gz
hercules-33600602dad4660319af2949e18735f5028b1b78.tar.bz2
hercules-33600602dad4660319af2949e18735f5028b1b78.tar.xz
hercules-33600602dad4660319af2949e18735f5028b1b78.zip
- Removed "serial". Sorry i merged from my source.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13763 54d463be-8e91-2dee-dedb-b68131a5f0ec
-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 757d3ccca..d3802c80b 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3131,8 +3131,8 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount)
i = MAX_INVENTORY;
- if( itemdb_isstackable2(data) && item_data->serial == 0 && item_data->expire_time == 0 )
- { // Stackable | Non Serialized (non unique) | Non Rental
+ if( itemdb_isstackable2(data) && item_data->expire_time == 0 )
+ { // Stackable | Non Rental
for( i = 0; i < MAX_INVENTORY; i++ )
{
if( sd->status.inventory[i].nameid == item_data->nameid && memcmp(&sd->status.inventory[i].card, &item_data->card, sizeof(item_data->card)) == 0 )
@@ -3495,7 +3495,7 @@ int pc_useitem(struct map_session_data *sd,int n)
//Logs (C)onsumable items [Lupus]
if( log_config.enable_logs&0x100 )
- log_pick_pc(sd, "C", sd->status.inventory[n].nameid, -1, &sd->status.inventory[n], sd->status.inventory[n].serial );
+ log_pick_pc(sd, "C", sd->status.inventory[n].nameid, -1, &sd->status.inventory[n]);
pc_delitem(sd,n,1,1); // Rental Usable Items are not deleted until expiration
}