Browse Source

- Removed "serial". Sorry i merged from my source.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13763 54d463be-8e91-2dee-dedb-b68131a5f0ec
zephyrus 16 years ago
parent
commit
76a985f7cb
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/map/pc.c

+ 3 - 3
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
 		}