Explorar o código

* Merged changes up to eAthena 15082. (skipped 15081)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15771 54d463be-8e91-2dee-dedb-b68131a5f0ec
eathenabot %!s(int64=13) %!d(string=hai) anos
pai
achega
ee2653b6eb
Modificáronse 2 ficheiros con 2 adicións e 7 borrados
  1. 0 6
      src/map/clif.c
  2. 2 1
      src/map/pc.c

+ 0 - 6
src/map/clif.c

@@ -2220,12 +2220,6 @@ void clif_delitem(struct map_session_data *sd,int n,int amount, short reason)
 
 	nullpo_retv(sd);
 	
-	if (reason == 7)
-	{
-		clif_dropitem(sd,n,amount);
-		return;
-	}
-
 	fd=sd->fd;
 	
 	WFIFOHEAD(fd, packet_len(0x7fa));

+ 2 - 1
src/map/pc.c

@@ -3745,7 +3745,8 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount)
 	if (!map_addflooritem(&sd->status.inventory[n], amount, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 2))
 		return 0;
 	
-	pc_delitem(sd, n, amount, 0, 7, LOG_TYPE_PICKDROP_PLAYER);
+	pc_delitem(sd, n, amount, 1, 0, LOG_TYPE_PICKDROP_PLAYER);
+	clif_dropitem(sd, n, amount);
 	return 1;
 }