- Fixed map_foreachiddb and map_foreachpc so they don't encapsulate the variable arguments into a double va_arg list. Thanks to the Ultra Mage for the tip.

- Cleaned up the clif_hate/mob_info functions with the correct fields/usage as explained by Rayce.
- Implemented clif_feel_hate_reset packet to properly display the Angel of the Sun/Moon/Stars, thanks again to Rayce for the relevant information.
- LP will again block all land-stuff from being placed down on top of it for the exception of Song/Dance/Encores.



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

1 files changed, 2 insertions, 4 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 7784be6ec..a5cc3ac09 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1399,16 +1399,14 @@ static int npc_unload_ev(DBKey key,void *data,va_list ap) {
 	return 0;

 }

 

-static int npc_unload_dup_sub(DBKey key,void * data,va_list app)

+static int npc_unload_dup_sub(DBKey key,void * data,va_list ap)

 {

 	struct npc_data *nd = (struct npc_data *)data;

-	va_list ap;

 	int src_id;

 

 	if(nd->bl.type!=BL_NPC || nd->bl.subtype != SCRIPT)

 		return 0;

 

-	ap = va_arg(app, va_list);

 	src_id=va_arg(ap,int);

 	if (nd->u.scr.src_id == src_id)

 		npc_unload(nd);

@@ -2834,7 +2832,7 @@ static int npc_cleanup_sub (struct block_list *bl, va_list ap) {
 	return 0;

 }

 

-static int npc_cleanup_dbsub(DBKey key,void * data,va_list app) {

+static int npc_cleanup_dbsub(DBKey key,void * data,va_list ap) {

 	return npc_cleanup_sub((struct block_list*)data, 0);

 }