- The memory leak reports will now print out in the logs also the revision they belong to.

- Cleaned up the scriptable npc-shop code, it should be crash-proof now.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8525 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 24 insertions, 18 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index b3decf5b3..ed66dbabf 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9420,10 +9420,8 @@ void clif_parse_NpcBuySellSelected(int fd,struct map_session_data *sd)
  */

 void clif_parse_NpcBuyListSend(int fd,struct map_session_data *sd)

 {

-	int fail=0,n, i;

+	int fail=0,n;

 	unsigned short *item_list;

-	unsigned char npc_ev[51];

-	struct npc_data *nd;

 	RFIFOHEAD(fd);

 

 	n = (RFIFOW(fd,2)-4) /4;

@@ -9431,21 +9429,8 @@ void clif_parse_NpcBuyListSend(int fd,struct map_session_data *sd)
 

 	if (sd->state.trading|| !sd->npc_shopid)

 		fail = 1;

-	else {

-		if((nd = ((struct npc_data *)map_id2bl(sd->npc_shopid))->master_nd)){

-			int regkey = add_str("@bought_nameid");

-			int regkey2 = add_str("@bought_quantity");

-			sprintf(npc_ev, "%s::OnBuyItem", nd->exname);

-			for(i=0;i<n;i++){

-				pc_setreg(sd,regkey+(i<<24),(int)item_list[i*2+1]);

-				pc_setreg(sd,regkey2+(i<<24),(int)item_list[i*2]);

-			}

-			npc_event(sd, npc_ev, 0);

-			fail = 0;

-		}else{

-			fail = npc_buylist(sd,n,item_list);

-		}

-	}

+	else

+		fail = npc_buylist(sd,n,item_list);

 

 	sd->npc_shopid = 0; //Clear shop data.

 	WFIFOHEAD(fd,packet_len_table[0xca]);

diff --git a/src/map/npc.c b/src/map/npc.c
index cd6e0b997..5ff34647c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1164,6 +1164,24 @@ int npc_buysellsel(struct map_session_data *sd,int id,int type)
 	return 0;

 }

 

+//npc_buylist for script-controlled shops.

+static int npc_buylist_sub(

+	struct map_session_data *sd,int n,

+	unsigned short *item_list, struct npc_data *nd)

+{

+	unsigned char npc_ev[51];

+	int i;

+	int regkey = add_str("@bought_nameid");

+	int regkey2 = add_str("@bought_quantity");

+	sprintf(npc_ev, "%s::OnBuyItem", nd->exname);

+	for(i=0;i<n;i++){

+		pc_setreg(sd,regkey+(i<<24),(int)item_list[i*2+1]);

+		pc_setreg(sd,regkey2+(i<<24),(int)item_list[i*2]);

+	}

+	npc_event(sd, npc_ev, 0);

+	return 0;

+}

+

 /*==========================================

  *

  *------------------------------------------

@@ -1180,6 +1198,9 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
 	if ((nd = npc_checknear(sd,map_id2bl(sd->npc_shopid))) == NULL)

 		return 3;

 

+	if (nd->master_nd) //Script-based shops.

+		return npc_buylist_sub(sd,n,item_list,nd->master_nd);

+

 	if (nd->bl.subtype!=SHOP)

 		return 3;