Used the "indent" C formatting program from GNU to do some clean ups

The command options used was:
-nbad -bap -sc -bl -blf -bli0 -cli4 -cbi0
-di5 -nbc -bls -ip2 -nut -ts4 -bap -i4 -sob -npsl

1 files changed, 1900 insertions, 1582 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 0c6c922..49fe578 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -27,29 +27,31 @@
 #include "memwatch.h"
 #endif
 
+struct npc_src_list
+{
+    struct npc_src_list *next;
+    struct npc_src_list *prev;
+    char name[4];
+};
 
+static struct npc_src_list *npc_src_first, *npc_src_last;
+static int npc_id = START_NPC_NUM;
+static int npc_warp, npc_shop, npc_script, npc_mob;
 
-struct npc_src_list {
-	struct npc_src_list * next;
-	struct npc_src_list * prev;
-	char name[4];
-} ;
-
-static struct npc_src_list *npc_src_first,*npc_src_last;
-static int npc_id=START_NPC_NUM;
-static int npc_warp,npc_shop,npc_script,npc_mob;
-
-int npc_get_new_npc_id(void){ return npc_id++; }
+int npc_get_new_npc_id (void)
+{
+    return npc_id++;
+}
 
 static struct dbt *ev_db;
 static struct dbt *npcname_db;
 
-struct event_data {
-	struct npc_data *nd;
-	int pos;
+struct event_data
+{
+    struct npc_data *nd;
+    int  pos;
 };
-static struct tm ev_tm_b;	// ���v�C�x���g�p
-
+static struct tm ev_tm_b;       // ���v�C�x���g�p
 
 /*==========================================
  * NPC�̖�����/�L����
@@ -57,94 +59,107 @@ static struct tm ev_tm_b;	// ���v�C�x���g�p
  * npc_enable_sub �L������OnTouch�C�x���g����s
  *------------------------------------------
  */
-int npc_enable_sub( struct block_list *bl, va_list ap )
+int npc_enable_sub (struct block_list *bl, va_list ap)
 {
-	struct map_session_data *sd;
-	struct npc_data *nd;
-	char *name=(char *)aCalloc(50,sizeof(char));
-
-	nullpo_retr(0, bl);
-	nullpo_retr(0, ap);
-	nullpo_retr(0, nd=va_arg(ap,struct npc_data *));
-	if(bl->type == BL_PC && (sd=(struct map_session_data *)bl)){
-
-		if (nd->flag&1)	// ��������������
-			return 1;
-
-		memcpy(name,nd->name,50);
-		if(sd->areanpc_id==nd->bl.id)
-			return 1;
-		sd->areanpc_id=nd->bl.id;
-		npc_event(sd,strcat(name,"::OnTouch"),0);
-	}
-	free(name);
-	return 0;
+    struct map_session_data *sd;
+    struct npc_data *nd;
+    char *name = (char *) aCalloc (50, sizeof (char));
+
+    nullpo_retr (0, bl);
+    nullpo_retr (0, ap);
+    nullpo_retr (0, nd = va_arg (ap, struct npc_data *));
+    if (bl->type == BL_PC && (sd = (struct map_session_data *) bl))
+    {
+
+        if (nd->flag & 1)       // ��������������
+            return 1;
+
+        memcpy (name, nd->name, 50);
+        if (sd->areanpc_id == nd->bl.id)
+            return 1;
+        sd->areanpc_id = nd->bl.id;
+        npc_event (sd, strcat (name, "::OnTouch"), 0);
+    }
+    free (name);
+    return 0;
 }
-int npc_enable(const char *name,int flag)
+
+int npc_enable (const char *name, int flag)
 {
-	struct npc_data *nd=strdb_search(npcname_db,name);
-	if (nd==NULL)
-		return 0;
-	
-	if (flag&1) {	// �L����
-		nd->flag&=~1;
-		clif_spawnnpc(nd);
-	}else if (flag&2){
-		nd->flag&=~1;
-		nd->option = 0x0000;
-		clif_changeoption(&nd->bl);
-	}else if (flag&4){
-		nd->flag|=1;
-		nd->option = 0x0002;
-		clif_changeoption(&nd->bl);
-	}else{		// ������
-		nd->flag|=1;
-		clif_clearchar(&nd->bl,0);
-	}
-	if(flag&3 && (nd->u.scr.xs > 0 || nd->u.scr.ys >0))
-		map_foreachinarea( npc_enable_sub,nd->bl.m,nd->bl.x-nd->u.scr.xs,nd->bl.y-nd->u.scr.ys,nd->bl.x+nd->u.scr.xs,nd->bl.y+nd->u.scr.ys,BL_PC,nd);
+    struct npc_data *nd = strdb_search (npcname_db, name);
+    if (nd == NULL)
+        return 0;
+
+    if (flag & 1)
+    {                           // �L����
+        nd->flag &= ~1;
+        clif_spawnnpc (nd);
+    }
+    else if (flag & 2)
+    {
+        nd->flag &= ~1;
+        nd->option = 0x0000;
+        clif_changeoption (&nd->bl);
+    }
+    else if (flag & 4)
+    {
+        nd->flag |= 1;
+        nd->option = 0x0002;
+        clif_changeoption (&nd->bl);
+    }
+    else
+    {                           // ������
+        nd->flag |= 1;
+        clif_clearchar (&nd->bl, 0);
+    }
+    if (flag & 3 && (nd->u.scr.xs > 0 || nd->u.scr.ys > 0))
+        map_foreachinarea (npc_enable_sub, nd->bl.m, nd->bl.x - nd->u.scr.xs,
+                           nd->bl.y - nd->u.scr.ys, nd->bl.x + nd->u.scr.xs,
+                           nd->bl.y + nd->u.scr.ys, BL_PC, nd);
 
-	return 0;
+    return 0;
 }
 
 /*==========================================
  * NPC�𖼑O�ŒT��
  *------------------------------------------
  */
-struct npc_data* npc_name2id(const char *name)
+struct npc_data *npc_name2id (const char *name)
 {
-	return strdb_search(npcname_db,name);
+    return strdb_search (npcname_db, name);
 }
+
 /*==========================================
  * �C�x���g�L���[�̃C�x���g����
  *------------------------------------------
  */
-int npc_event_dequeue(struct map_session_data *sd)
+int npc_event_dequeue (struct map_session_data *sd)
 {
-	nullpo_retr(0, sd);
-
-	sd->npc_id=0;
-	if (sd->eventqueue[0][0]) {	// �L���[�̃C�x���g����
-		char *name=(char *)aCalloc(50,sizeof(char));
-		int i;
-
-		memcpy(name,sd->eventqueue[0],50);
-		for(i=MAX_EVENTQUEUE-2;i>=0;i--)
-			memcpy(sd->eventqueue[i],sd->eventqueue[i+1],50);
-		add_timer(gettick()+100,npc_event_timer,sd->bl.id,(int)name);
-	}
-	return 0;
+    nullpo_retr (0, sd);
+
+    sd->npc_id = 0;
+    if (sd->eventqueue[0][0])
+    {                           // �L���[�̃C�x���g����
+        char *name = (char *) aCalloc (50, sizeof (char));
+        int  i;
+
+        memcpy (name, sd->eventqueue[0], 50);
+        for (i = MAX_EVENTQUEUE - 2; i >= 0; i--)
+            memcpy (sd->eventqueue[i], sd->eventqueue[i + 1], 50);
+        add_timer (gettick () + 100, npc_event_timer, sd->bl.id, (int) name);
+    }
+    return 0;
 }
 
-int npc_delete(struct npc_data *nd)
+int npc_delete (struct npc_data *nd)
 {
-    nullpo_retr(1, nd);
+    nullpo_retr (1, nd);
 
-    if(nd->bl.prev == NULL)
+    if (nd->bl.prev == NULL)
         return 1;
 
-    clif_clearchar_area(&nd->bl,1);
-    map_delblock(&nd->bl);
+    clif_clearchar_area (&nd->bl, 1);
+    map_delblock (&nd->bl);
     return 0;
 }
 
@@ -152,32 +167,34 @@ int npc_delete(struct npc_data *nd)
  * �C�x���g�̒x����s
  *------------------------------------------
  */
-int npc_event_timer(int tid,unsigned int tick,int id,int data)
+int npc_event_timer (int tid, unsigned int tick, int id, int data)
 {
-	struct map_session_data *sd=map_id2sd(id);
-	if (sd==NULL)
-		return 0;
-	
-	npc_event(sd,(const char *)data,0);
-	free((void*)data);
-	return 0;
+    struct map_session_data *sd = map_id2sd (id);
+    if (sd == NULL)
+        return 0;
+
+    npc_event (sd, (const char *) data, 0);
+    free ((void *) data);
+    return 0;
 }
 
-int npc_timer_event(const char *eventname)	// Added by RoVeRT
+int npc_timer_event (const char *eventname) // Added by RoVeRT
 {
-	struct event_data *ev=strdb_search(ev_db,eventname);
-	struct npc_data *nd;
-//	int xs,ys;
-
-	if((ev==NULL || (nd=ev->nd)==NULL)){
-		printf("npc_event: event not found [%s]\n",eventname);
-		return 0;
-	}
+    struct event_data *ev = strdb_search (ev_db, eventname);
+    struct npc_data *nd;
+//  int xs,ys;
+
+    if ((ev == NULL || (nd = ev->nd) == NULL))
+    {
+        printf ("npc_event: event not found [%s]\n", eventname);
+        return 0;
+    }
 
-	run_script(nd->u.scr.script,ev->pos,nd->bl.id,nd->bl.id);
+    run_script (nd->u.scr.script, ev->pos, nd->bl.id, nd->bl.id);
 
-	return 0;
+    return 0;
 }
+
 /*
 int npc_timer_sub_sub(void *key,void *data,va_list ap)	// Added by RoVeRT
 {
@@ -227,839 +244,951 @@ int npc_timer(int tid,unsigned int tick,int id,int data)	// Added by RoVeRT
  * npc_parse_script->strdb_foreach�����Ă΂���
  *------------------------------------------
  */
-int npc_event_export(void *key,void *data,va_list ap)
+int npc_event_export (void *key, void *data, va_list ap)
 {
-	char *lname=(char *)key;
-	int pos=(int)data;
-	struct npc_data *nd=va_arg(ap,struct npc_data *);
-	
-	if ((lname[0]=='O' || lname[0]=='o')&&(lname[1]=='N' || lname[1]=='n')) {
-		struct event_data *ev;
-		char *buf;
-		char *p=strchr(lname,':');
-		// �G�N�X�|�[�g������
-		ev=calloc(sizeof(struct event_data), 1);
-		buf=calloc(50, 1);
-		if (ev==NULL || buf==NULL) {
-			printf("npc_event_export: out of memory !\n");
-			exit(1);
-		}else if (p==NULL || (p-lname)>24) {
-			printf("npc_event_export: label name error !\n");
-			exit(1);
-		}else{
-			ev->nd=nd;
-			ev->pos=pos;
-			*p='\0';
-			sprintf(buf,"%s::%s",nd->exname,lname);
-			*p=':';
-			strdb_insert(ev_db,buf,ev);
-//			if (battle_config.etc_log)
-//				printf("npc_event_export: export [%s]\n",buf);
-		}
-	}
-	return 0;
+    char *lname = (char *) key;
+    int  pos = (int) data;
+    struct npc_data *nd = va_arg (ap, struct npc_data *);
+
+    if ((lname[0] == 'O' || lname[0] == 'o')
+        && (lname[1] == 'N' || lname[1] == 'n'))
+    {
+        struct event_data *ev;
+        char *buf;
+        char *p = strchr (lname, ':');
+        // �G�N�X�|�[�g������
+        ev = calloc (sizeof (struct event_data), 1);
+        buf = calloc (50, 1);
+        if (ev == NULL || buf == NULL)
+        {
+            printf ("npc_event_export: out of memory !\n");
+            exit (1);
+        }
+        else if (p == NULL || (p - lname) > 24)
+        {
+            printf ("npc_event_export: label name error !\n");
+            exit (1);
+        }
+        else
+        {
+            ev->nd = nd;
+            ev->pos = pos;
+            *p = '\0';
+            sprintf (buf, "%s::%s", nd->exname, lname);
+            *p = ':';
+            strdb_insert (ev_db, buf, ev);
+//          if (battle_config.etc_log)
+//              printf("npc_event_export: export [%s]\n",buf);
+        }
+    }
+    return 0;
 }
 
 /*==========================================
  * �S��NPC��On*�C�x���g��s
  *------------------------------------------
  */
-int npc_event_doall_sub(void *key,void *data,va_list ap)
+int npc_event_doall_sub (void *key, void *data, va_list ap)
 {
-	char *p=(char *)key;
-        int rid, argc;
-        argrec_t *argv;
-	struct event_data *ev;
-	int *c;
-	const char *name;
-
-	nullpo_retr(0, ev=(struct event_data *)data);
-	nullpo_retr(0, ap);
-	nullpo_retr(0, c=va_arg(ap,int *));
-
-	name=va_arg(ap,const char *);
-        rid = va_arg(ap, int);
-        argc = va_arg(ap, int);
-        argv = va_arg(ap, argrec_t *);
-
+    char *p = (char *) key;
+    int  rid, argc;
+    argrec_t *argv;
+    struct event_data *ev;
+    int *c;
+    const char *name;
+
+    nullpo_retr (0, ev = (struct event_data *) data);
+    nullpo_retr (0, ap);
+    nullpo_retr (0, c = va_arg (ap, int *));
+
+    name = va_arg (ap, const char *);
+    rid = va_arg (ap, int);
+    argc = va_arg (ap, int);
+    argv = va_arg (ap, argrec_t *);
+
+    if ((p = strchr (p, ':')) && p && strcasecmp (name, p) == 0)
+    {
+        run_script_l (ev->nd->u.scr.script, ev->pos, rid, ev->nd->bl.id, argc,
+                      argv);
+        (*c)++;
+    }
 
-	if( (p=strchr(p,':')) && p && strcasecmp(name,p)==0 ){
-                run_script_l(ev->nd->u.scr.script,ev->pos,rid,ev->nd->bl.id, argc, argv);
-		(*c)++;
-	}
-	
-	return 0;
-}
-int npc_event_doall_l(const char *name, int rid, int argc, argrec_t *args)
-{
-	int c=0;
-	char buf[64]="::";
-	
-	strncpy(buf+2,name,62);
-	strdb_foreach(ev_db,npc_event_doall_sub,&c,buf, rid, argc, args);
-	return c;
+    return 0;
 }
 
-int npc_event_do_sub(void *key,void *data, va_list ap)
+int npc_event_doall_l (const char *name, int rid, int argc, argrec_t * args)
 {
-	char *p=(char *)key;
-	struct event_data *ev;
-	int *c;
-	const char *name;
-        int rid, argc;
-        argrec_t *argv;
-
-	nullpo_retr(0, ev=(struct event_data *)data);
-	nullpo_retr(0, ap);
-	nullpo_retr(0, c=va_arg(ap,int *));
-
-	name=va_arg(ap,const char *);
-        rid = va_arg(ap, int);
-        argc = va_arg(ap, int);
-        argv = va_arg(ap, argrec_t *);
+    int  c = 0;
+    char buf[64] = "::";
 
+    strncpy (buf + 2, name, 62);
+    strdb_foreach (ev_db, npc_event_doall_sub, &c, buf, rid, argc, args);
+    return c;
+}
 
-	if (p && strcasecmp(name,p)==0 ) {
-		run_script_l(ev->nd->u.scr.script,ev->pos, rid, ev->nd->bl.id, argc, argv);
-		(*c)++;
-	}
+int npc_event_do_sub (void *key, void *data, va_list ap)
+{
+    char *p = (char *) key;
+    struct event_data *ev;
+    int *c;
+    const char *name;
+    int  rid, argc;
+    argrec_t *argv;
+
+    nullpo_retr (0, ev = (struct event_data *) data);
+    nullpo_retr (0, ap);
+    nullpo_retr (0, c = va_arg (ap, int *));
+
+    name = va_arg (ap, const char *);
+    rid = va_arg (ap, int);
+    argc = va_arg (ap, int);
+    argv = va_arg (ap, argrec_t *);
+
+    if (p && strcasecmp (name, p) == 0)
+    {
+        run_script_l (ev->nd->u.scr.script, ev->pos, rid, ev->nd->bl.id, argc,
+                      argv);
+        (*c)++;
+    }
 
-	return 0;
+    return 0;
 }
-int npc_event_do_l(const char *name, int rid, int argc, argrec_t *args)
+
+int npc_event_do_l (const char *name, int rid, int argc, argrec_t * args)
 {
-	int c=0;
-	
-	if (*name==':' && name[1]==':') {
-		return npc_event_doall_l(name+2, rid, argc, args);
-	}
+    int  c = 0;
 
-	strdb_foreach(ev_db,npc_event_do_sub,&c,name, rid, argc, args);
-	return c;
+    if (*name == ':' && name[1] == ':')
+    {
+        return npc_event_doall_l (name + 2, rid, argc, args);
+    }
+
+    strdb_foreach (ev_db, npc_event_do_sub, &c, name, rid, argc, args);
+    return c;
 }
 
 /*==========================================
  * ���v�C�x���g��s
  *------------------------------------------
  */
-int npc_event_do_clock(int tid,unsigned int tick,int id,int data)
+int npc_event_do_clock (int tid, unsigned int tick, int id, int data)
 {
-	time_t timer;
-	struct tm *t;
-	char buf[64];
-	int c=0;
-	
-	time(&timer);
-	t=gmtime(&timer);
-	
-	if (t->tm_min != ev_tm_b.tm_min ) {
-		sprintf(buf,"OnMinute%02d",t->tm_min);
-		c+=npc_event_doall(buf);
-		sprintf(buf,"OnClock%02d%02d",t->tm_hour,t->tm_min);
-		c+=npc_event_doall(buf);
-	}
-	if (t->tm_hour!= ev_tm_b.tm_hour) {
-		sprintf(buf,"OnHour%02d",t->tm_hour);
-		c+=npc_event_doall(buf);
-	}
-	if (t->tm_mday!= ev_tm_b.tm_mday) {
-		sprintf(buf,"OnDay%02d%02d",t->tm_mon+1,t->tm_mday);
-		c+=npc_event_doall(buf);
-	}
-	memcpy(&ev_tm_b,t,sizeof(ev_tm_b));
-	return c;
+    time_t timer;
+    struct tm *t;
+    char buf[64];
+    int  c = 0;
+
+    time (&timer);
+    t = gmtime (&timer);
+
+    if (t->tm_min != ev_tm_b.tm_min)
+    {
+        sprintf (buf, "OnMinute%02d", t->tm_min);
+        c += npc_event_doall (buf);
+        sprintf (buf, "OnClock%02d%02d", t->tm_hour, t->tm_min);
+        c += npc_event_doall (buf);
+    }
+    if (t->tm_hour != ev_tm_b.tm_hour)
+    {
+        sprintf (buf, "OnHour%02d", t->tm_hour);
+        c += npc_event_doall (buf);
+    }
+    if (t->tm_mday != ev_tm_b.tm_mday)
+    {
+        sprintf (buf, "OnDay%02d%02d", t->tm_mon + 1, t->tm_mday);
+        c += npc_event_doall (buf);
+    }
+    memcpy (&ev_tm_b, t, sizeof (ev_tm_b));
+    return c;
 }
+
 /*==========================================
  * OnInit�C�x���g��s(&���v�C�x���g�J�n)
  *------------------------------------------
  */
-int npc_event_do_oninit(void)
+int npc_event_do_oninit (void)
 {
-	int c = npc_event_doall("OnInit");
-	printf("npc: OnInit Event done. (%d npc)\n",c);
+    int  c = npc_event_doall ("OnInit");
+    printf ("npc: OnInit Event done. (%d npc)\n", c);
 
-	add_timer_interval(gettick()+100,
-		npc_event_do_clock,0,0,1000);
+    add_timer_interval (gettick () + 100, npc_event_do_clock, 0, 0, 1000);
 
-	return 0;
+    return 0;
 }
+
 /*==========================================
  * OnTimer NPC event - by RoVeRT
  *------------------------------------------
  */
-int npc_addeventtimer(struct npc_data *nd,int tick,const char *name)
+int npc_addeventtimer (struct npc_data *nd, int tick, const char *name)
 {
-	int i;
-	for(i=0;i<MAX_EVENTTIMER;i++)
-		if( nd->eventtimer[i]==-1 )
-			break;
-	if(i<MAX_EVENTTIMER){
-		char *evname=malloc(24);
-		if(evname==NULL){
-			printf("npc_addeventtimer: out of memory !\n");exit(1);
-		}
-		memcpy(evname,name,24);
-		nd->eventtimer[i]=add_timer(gettick()+tick,
-			npc_event_timer,nd->bl.id,(int)evname);
-	}else
-		printf("npc_addtimer: event timer is full !\n");
+    int  i;
+    for (i = 0; i < MAX_EVENTTIMER; i++)
+        if (nd->eventtimer[i] == -1)
+            break;
+    if (i < MAX_EVENTTIMER)
+    {
+        char *evname = malloc (24);
+        if (evname == NULL)
+        {
+            printf ("npc_addeventtimer: out of memory !\n");
+            exit (1);
+        }
+        memcpy (evname, name, 24);
+        nd->eventtimer[i] = add_timer (gettick () + tick,
+                                       npc_event_timer, nd->bl.id,
+                                       (int) evname);
+    }
+    else
+        printf ("npc_addtimer: event timer is full !\n");
 
-	return 0;
+    return 0;
 }
 
-int npc_deleventtimer(struct npc_data *nd,const char *name)
+int npc_deleventtimer (struct npc_data *nd, const char *name)
 {
-	int i;
-	for(i=0;i<MAX_EVENTTIMER;i++)
-		if( nd->eventtimer[i]!=-1 && strcmp(
-			(char *)(get_timer(nd->eventtimer[i])->data), name)==0 ){
-				delete_timer(nd->eventtimer[i],npc_event_timer);
-				nd->eventtimer[i]=-1;
-				break;
-		}
+    int  i;
+    for (i = 0; i < MAX_EVENTTIMER; i++)
+        if (nd->eventtimer[i] != -1 && strcmp ((char
+                                                *) (get_timer (nd->eventtimer
+                                                               [i])->data),
+                                               name) == 0)
+        {
+            delete_timer (nd->eventtimer[i], npc_event_timer);
+            nd->eventtimer[i] = -1;
+            break;
+        }
 
-	return 0;
+    return 0;
 }
 
-int npc_cleareventtimer(struct npc_data *nd)
+int npc_cleareventtimer (struct npc_data *nd)
 {
-	int i;
-	for(i=0;i<MAX_EVENTTIMER;i++)
-		if( nd->eventtimer[i]!=-1 ){
-			delete_timer(nd->eventtimer[i],npc_event_timer);
-			nd->eventtimer[i]=-1;
-		}
+    int  i;
+    for (i = 0; i < MAX_EVENTTIMER; i++)
+        if (nd->eventtimer[i] != -1)
+        {
+            delete_timer (nd->eventtimer[i], npc_event_timer);
+            nd->eventtimer[i] = -1;
+        }
 
-	return 0;
+    return 0;
 }
 
-int npc_do_ontimer_sub(void *key,void *data,va_list ap)
+int npc_do_ontimer_sub (void *key, void *data, va_list ap)
 {
-	char *p=(char *)key;
-	struct event_data *ev=(struct event_data *)data;
-	int *c=va_arg(ap,int *);
-//	struct map_session_data *sd=va_arg(ap,struct map_session_data *);
-	int option=va_arg(ap,int);
-	int tick=0;
-	char temp[10];
-	char event[50];
-
-	if(ev->nd->bl.id==(int)*c && (p=strchr(p,':')) && p && strncasecmp("::OnTimer",p,8)==0 ){
-		sscanf(&p[9],"%s",temp);
-		tick=atoi(temp);
-
-		strcpy( event, ev->nd->name);
-		strcat( event, p);
-
-		if (option!=0) {
-			npc_addeventtimer(ev->nd,tick,event);
-		} else {
-			npc_deleventtimer(ev->nd,event);
-		}
-	}
-	return 0;
+    char *p = (char *) key;
+    struct event_data *ev = (struct event_data *) data;
+    int *c = va_arg (ap, int *);
+//  struct map_session_data *sd=va_arg(ap,struct map_session_data *);
+    int  option = va_arg (ap, int);
+    int  tick = 0;
+    char temp[10];
+    char event[50];
+
+    if (ev->nd->bl.id == (int) *c && (p = strchr (p, ':')) && p
+        && strncasecmp ("::OnTimer", p, 8) == 0)
+    {
+        sscanf (&p[9], "%s", temp);
+        tick = atoi (temp);
+
+        strcpy (event, ev->nd->name);
+        strcat (event, p);
+
+        if (option != 0)
+        {
+            npc_addeventtimer (ev->nd, tick, event);
+        }
+        else
+        {
+            npc_deleventtimer (ev->nd, event);
+        }
+    }
+    return 0;
 }
-int npc_do_ontimer(int npc_id, struct map_session_data *sd, int option)
+
+int npc_do_ontimer (int npc_id, struct map_session_data *sd, int option)
 {
-	strdb_foreach(ev_db,npc_do_ontimer_sub,&npc_id,sd,option);
-	return 0;
+    strdb_foreach (ev_db, npc_do_ontimer_sub, &npc_id, sd, option);
+    return 0;
 }
+
 /*==========================================
  * �^�C�}�[�C�x���g�p���x���̎��荞��
  * npc_parse_script->strdb_foreach�����Ă΂���
  *------------------------------------------
  */
-int npc_timerevent_import(void *key,void *data,va_list ap)
+int npc_timerevent_import (void *key, void *data, va_list ap)
 {
-	char *lname=(char *)key;
-	int pos=(int)data;
-	struct npc_data *nd=va_arg(ap,struct npc_data *);
-	int t=0,i=0;
-	
-	if(sscanf(lname,"OnTimer%d%n",&t,&i)==1 && lname[i]==':') {
-		// �^�C�}�[�C�x���g
-		struct npc_timerevent_list *te=nd->u.scr.timer_event;
-		int j,i=nd->u.scr.timeramount;
-		if(te==NULL) te=malloc(sizeof(struct npc_timerevent_list));
-		else te=realloc( te, sizeof(struct npc_timerevent_list) * (i+1) );
-		if(te==NULL){
-			printf("npc_timerevent_import: out of memory !\n");
-			exit(1);
-		}
-		for(j=0;j<i;j++){
-			if(te[j].timer>t){
-				memmove(te+j+1,te+j,sizeof(struct npc_timerevent_list)*(i-j));
-				break;
-			}
-		}
-		te[j].timer=t;
-		te[j].pos=pos;
-		nd->u.scr.timer_event=te;
-		nd->u.scr.timeramount=i+1;
-	}
-	return 0;
+    char *lname = (char *) key;
+    int  pos = (int) data;
+    struct npc_data *nd = va_arg (ap, struct npc_data *);
+    int  t = 0, i = 0;
+
+    if (sscanf (lname, "OnTimer%d%n", &t, &i) == 1 && lname[i] == ':')
+    {
+        // �^�C�}�[�C�x���g
+        struct npc_timerevent_list *te = nd->u.scr.timer_event;
+        int  j, i = nd->u.scr.timeramount;
+        if (te == NULL)
+            te = malloc (sizeof (struct npc_timerevent_list));
+        else
+            te = realloc (te, sizeof (struct npc_timerevent_list) * (i + 1));
+        if (te == NULL)
+        {
+            printf ("npc_timerevent_import: out of memory !\n");
+            exit (1);
+        }
+        for (j = 0; j < i; j++)
+        {
+            if (te[j].timer > t)
+            {
+                memmove (te + j + 1, te + j,
+                         sizeof (struct npc_timerevent_list) * (i - j));
+                break;
+            }
+        }
+        te[j].timer = t;
+        te[j].pos = pos;
+        nd->u.scr.timer_event = te;
+        nd->u.scr.timeramount = i + 1;
+    }
+    return 0;
 }
+
 /*==========================================
  * �^�C�}�[�C�x���g��s
  *------------------------------------------
  */
-int npc_timerevent(int tid,unsigned int tick,int id,int data)
+int npc_timerevent (int tid, unsigned int tick, int id, int data)
 {
-	int next,t;
-	struct npc_data* nd=(struct npc_data *)map_id2bl(id);
-	struct npc_timerevent_list *te;
-	if( nd==NULL || nd->u.scr.nexttimer<0 ){
-		printf("npc_timerevent: ??\n");
-		return 0;
-	}
-	nd->u.scr.timertick=tick;
-	te=nd->u.scr.timer_event+ nd->u.scr.nexttimer;
-	nd->u.scr.timerid = -1;
-	
-	t = nd->u.scr.timer+=data;
-	nd->u.scr.nexttimer++;
-	if( nd->u.scr.timeramount>nd->u.scr.nexttimer ){
-		next= nd->u.scr.timer_event[ nd->u.scr.nexttimer ].timer - t;
-		nd->u.scr.timerid = add_timer(tick+next,npc_timerevent,id,next);
-	}
+    int  next, t;
+    struct npc_data *nd = (struct npc_data *) map_id2bl (id);
+    struct npc_timerevent_list *te;
+    if (nd == NULL || nd->u.scr.nexttimer < 0)
+    {
+        printf ("npc_timerevent: ??\n");
+        return 0;
+    }
+    nd->u.scr.timertick = tick;
+    te = nd->u.scr.timer_event + nd->u.scr.nexttimer;
+    nd->u.scr.timerid = -1;
+
+    t = nd->u.scr.timer += data;
+    nd->u.scr.nexttimer++;
+    if (nd->u.scr.timeramount > nd->u.scr.nexttimer)
+    {
+        next = nd->u.scr.timer_event[nd->u.scr.nexttimer].timer - t;
+        nd->u.scr.timerid = add_timer (tick + next, npc_timerevent, id, next);
+    }
 
-	run_script(nd->u.scr.script,te->pos,0,nd->bl.id);
-	return 0;
+    run_script (nd->u.scr.script, te->pos, 0, nd->bl.id);
+    return 0;
 }
+
 /*==========================================
  * �^�C�}�[�C�x���g�J�n
  *------------------------------------------
  */
-int npc_timerevent_start(struct npc_data *nd)
+int npc_timerevent_start (struct npc_data *nd)
 {
-	int j,n, next;
+    int  j, n, next;
 
-	nullpo_retr(0, nd);
+    nullpo_retr (0, nd);
 
-	n=nd->u.scr.timeramount;
-	if( nd->u.scr.nexttimer>=0 || n==0 )
-		return 0;
-	
-	for(j=0;j<n;j++){
-		if( nd->u.scr.timer_event[j].timer > nd->u.scr.timer )
-			break;
-	}
-	nd->u.scr.nexttimer=j;
-	nd->u.scr.timertick=gettick();
+    n = nd->u.scr.timeramount;
+    if (nd->u.scr.nexttimer >= 0 || n == 0)
+        return 0;
 
-	if(j>=n)
-		return 0;
-	
-	next = nd->u.scr.timer_event[j].timer - nd->u.scr.timer;
-	nd->u.scr.timerid = add_timer(gettick()+next,npc_timerevent,nd->bl.id,next);
-	return 0;
+    for (j = 0; j < n; j++)
+    {
+        if (nd->u.scr.timer_event[j].timer > nd->u.scr.timer)
+            break;
+    }
+    nd->u.scr.nexttimer = j;
+    nd->u.scr.timertick = gettick ();
+
+    if (j >= n)
+        return 0;
+
+    next = nd->u.scr.timer_event[j].timer - nd->u.scr.timer;
+    nd->u.scr.timerid =
+        add_timer (gettick () + next, npc_timerevent, nd->bl.id, next);
+    return 0;
 }
+
 /*==========================================
  * �^�C�}�[�C�x���g�I��
  *------------------------------------------
  */
-int npc_timerevent_stop(struct npc_data *nd)
+int npc_timerevent_stop (struct npc_data *nd)
 {
-	nullpo_retr(0, nd);
-
-	if( nd->u.scr.nexttimer>=0 ){
-		nd->u.scr.nexttimer = -1;
-		nd->u.scr.timer += (int)(gettick() - nd->u.scr.timertick);
-		if(nd->u.scr.timerid!=-1)
-			delete_timer(nd->u.scr.timerid,npc_timerevent);
-		nd->u.scr.timerid = -1;
-	}
-	return 0;
+    nullpo_retr (0, nd);
+
+    if (nd->u.scr.nexttimer >= 0)
+    {
+        nd->u.scr.nexttimer = -1;
+        nd->u.scr.timer += (int) (gettick () - nd->u.scr.timertick);
+        if (nd->u.scr.timerid != -1)
+            delete_timer (nd->u.scr.timerid, npc_timerevent);
+        nd->u.scr.timerid = -1;
+    }
+    return 0;
 }
+
 /*==========================================
  * �^�C�}�[�l�̏���
  *------------------------------------------
  */
-int npc_gettimerevent_tick(struct npc_data *nd)
+int npc_gettimerevent_tick (struct npc_data *nd)
 {
-	int tick;
+    int  tick;
 
-	nullpo_retr(0, nd);
+    nullpo_retr (0, nd);
 
-	tick=nd->u.scr.timer;
+    tick = nd->u.scr.timer;
 
-	if( nd->u.scr.nexttimer>=0 )
-		tick += (int)(gettick() - nd->u.scr.timertick);
-	return tick;
+    if (nd->u.scr.nexttimer >= 0)
+        tick += (int) (gettick () - nd->u.scr.timertick);
+    return tick;
 }
+
 /*==========================================
  * �^�C�}�[�l�̐ݒ�
  *------------------------------------------
  */
-int npc_settimerevent_tick(struct npc_data *nd,int newtimer)
+int npc_settimerevent_tick (struct npc_data *nd, int newtimer)
 {
-	int flag;
+    int  flag;
 
-	nullpo_retr(0, nd);
+    nullpo_retr (0, nd);
 
-	flag= nd->u.scr.nexttimer;
+    flag = nd->u.scr.nexttimer;
 
-	npc_timerevent_stop(nd);
-	nd->u.scr.timer=newtimer;
-	if(flag>=0)
-		npc_timerevent_start(nd);
-	return 0;
+    npc_timerevent_stop (nd);
+    nd->u.scr.timer = newtimer;
+    if (flag >= 0)
+        npc_timerevent_start (nd);
+    return 0;
 }
 
 /*==========================================
  * �C�x���g�^��NPC����
  *------------------------------------------
  */
-int npc_event(struct map_session_data *sd,const char *eventname,int mob_kill)
+int npc_event (struct map_session_data *sd, const char *eventname,
+               int mob_kill)
 {
-	struct event_data *ev=strdb_search(ev_db,eventname);
-	struct npc_data *nd;
-	int xs,ys;
-	char mobevent[100];
+    struct event_data *ev = strdb_search (ev_db, eventname);
+    struct npc_data *nd;
+    int  xs, ys;
+    char mobevent[100];
+
+    if (sd == NULL)
+    {
+        printf ("npc_event nullpo?\n");
+    }
 
-	if( sd == NULL ){
-		printf("npc_event nullpo?\n");
-	}
+    if (ev == NULL && eventname
+        && strcmp (((eventname) + strlen (eventname) - 9), "::OnTouch") == 0)
+        return 1;
 
-	if(ev==NULL && eventname && strcmp(((eventname)+strlen(eventname)-9),"::OnTouch") == 0)
-	return 1;
-
-	if(ev==NULL || (nd=ev->nd)==NULL){
-		if(mob_kill && (ev==NULL || (nd=ev->nd)==NULL)){
-			strcpy( mobevent, eventname);
-			strcat( mobevent, "::OnMyMobDead");
-			ev=strdb_search(ev_db,mobevent);
-	if (ev==NULL || (nd=ev->nd)==NULL) {
-				if (strncasecmp(eventname,"GM_MONSTER",10)!=0)
-					printf("npc_event: event not found [%s]\n",mobevent);
-				return 0;
-			}
-		}
-		else {
-			if(battle_config.error_log)
-				printf("npc_event: event not found [%s]\n",eventname);
-			return 0;
-		}
-	}
+    if (ev == NULL || (nd = ev->nd) == NULL)
+    {
+        if (mob_kill && (ev == NULL || (nd = ev->nd) == NULL))
+        {
+            strcpy (mobevent, eventname);
+            strcat (mobevent, "::OnMyMobDead");
+            ev = strdb_search (ev_db, mobevent);
+            if (ev == NULL || (nd = ev->nd) == NULL)
+            {
+                if (strncasecmp (eventname, "GM_MONSTER", 10) != 0)
+                    printf ("npc_event: event not found [%s]\n", mobevent);
+                return 0;
+            }
+        }
+        else
+        {
+            if (battle_config.error_log)
+                printf ("npc_event: event not found [%s]\n", eventname);
+            return 0;
+        }
+    }
 
-	xs=nd->u.scr.xs;
-	ys=nd->u.scr.ys;
-	if (xs>=0 && ys>=0 ) {
-		if (nd->bl.m != sd->bl.m )
-			return 1;
-		if ( xs>0 && (sd->bl.x<nd->bl.x-xs/2 || nd->bl.x+xs/2<sd->bl.x) )
-			return 1;
-		if ( ys>0 && (sd->bl.y<nd->bl.y-ys/2 || nd->bl.y+ys/2<sd->bl.y) )
-			return 1;
-	}
+    xs = nd->u.scr.xs;
+    ys = nd->u.scr.ys;
+    if (xs >= 0 && ys >= 0)
+    {
+        if (nd->bl.m != sd->bl.m)
+            return 1;
+        if (xs > 0
+            && (sd->bl.x < nd->bl.x - xs / 2 || nd->bl.x + xs / 2 < sd->bl.x))
+            return 1;
+        if (ys > 0
+            && (sd->bl.y < nd->bl.y - ys / 2 || nd->bl.y + ys / 2 < sd->bl.y))
+            return 1;
+    }
 
-	if ( sd->npc_id!=0) {
-//		if (battle_config.error_log)
-//			printf("npc_event: npc_id != 0\n");
-		int i;
-		for(i=0;i<MAX_EVENTQUEUE;i++)
-			if (!sd->eventqueue[i][0])
-				break;
-		if (i==MAX_EVENTQUEUE) {
-			if (battle_config.error_log)
-				printf("npc_event: event queue is full !\n");
-		}else{
-//			if (battle_config.etc_log)
-//				printf("npc_event: enqueue\n");
-			memcpy(sd->eventqueue[i],eventname,50);
-		}
-		return 1;
-	}
-	if (nd->flag&1) {	// ��������������
-		npc_event_dequeue(sd);
-		return 0;
-	}
+    if (sd->npc_id != 0)
+    {
+//      if (battle_config.error_log)
+//          printf("npc_event: npc_id != 0\n");
+        int  i;
+        for (i = 0; i < MAX_EVENTQUEUE; i++)
+            if (!sd->eventqueue[i][0])
+                break;
+        if (i == MAX_EVENTQUEUE)
+        {
+            if (battle_config.error_log)
+                printf ("npc_event: event queue is full !\n");
+        }
+        else
+        {
+//          if (battle_config.etc_log)
+//              printf("npc_event: enqueue\n");
+            memcpy (sd->eventqueue[i], eventname, 50);
+        }
+        return 1;
+    }
+    if (nd->flag & 1)
+    {                           // ��������������
+        npc_event_dequeue (sd);
+        return 0;
+    }
 
-	sd->npc_id=nd->bl.id;
-	sd->npc_pos=run_script(nd->u.scr.script,ev->pos,sd->bl.id,nd->bl.id);
-	return 0;
+    sd->npc_id = nd->bl.id;
+    sd->npc_pos =
+        run_script (nd->u.scr.script, ev->pos, sd->bl.id, nd->bl.id);
+    return 0;
 }
 
-
-int npc_command_sub(void *key,void *data,va_list ap)
+int npc_command_sub (void *key, void *data, va_list ap)
 {
-	char *p=(char *)key;
-	struct event_data *ev=(struct event_data *)data;
-	char *npcname=va_arg(ap,char *);
-	char *command=va_arg(ap,char *);
-	char temp[100];
-
-	if(strcmp(ev->nd->name,npcname)==0 && (p=strchr(p,':')) && p && strncasecmp("::OnCommand",p,10)==0 ){
-		sscanf(&p[11],"%s",temp);
+    char *p = (char *) key;
+    struct event_data *ev = (struct event_data *) data;
+    char *npcname = va_arg (ap, char *);
+    char *command = va_arg (ap, char *);
+    char temp[100];
+
+    if (strcmp (ev->nd->name, npcname) == 0 && (p = strchr (p, ':')) && p
+        && strncasecmp ("::OnCommand", p, 10) == 0)
+    {
+        sscanf (&p[11], "%s", temp);
+
+        if (strcmp (command, temp) == 0)
+            run_script (ev->nd->u.scr.script, ev->pos, 0, ev->nd->bl.id);
+    }
 
-		if (strcmp(command,temp)==0)
-			run_script(ev->nd->u.scr.script,ev->pos,0,ev->nd->bl.id);
-	}
-	
-	return 0;
+    return 0;
 }
 
-int npc_command(struct map_session_data *sd,char *npcname,char *command)
+int npc_command (struct map_session_data *sd, char *npcname, char *command)
 {
-	strdb_foreach(ev_db,npc_command_sub,npcname,command);
+    strdb_foreach (ev_db, npc_command_sub, npcname, command);
 
-	return 0;
+    return 0;
 }
+
 /*==========================================
  * �ڐG�^��NPC����
  *------------------------------------------
  */
-int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
+int npc_touch_areanpc (struct map_session_data *sd, int m, int x, int y)
 {
-	int i,f=1;
-	int xs,ys;
+    int  i, f = 1;
+    int  xs, ys;
 
-	nullpo_retr(1, sd);
+    nullpo_retr (1, sd);
 
-	if(sd->npc_id)
-		return 1;
+    if (sd->npc_id)
+        return 1;
 
-	for(i=0;i<map[m].npc_num;i++) {
-		if (map[m].npc[i]->flag&1) {	// ��������������
-			f=0;
-			continue;
-		}
-	
-		switch(map[m].npc[i]->bl.subtype) {
-		case WARP:
-			xs=map[m].npc[i]->u.warp.xs;
-			ys=map[m].npc[i]->u.warp.ys;
-			break;
-		case MESSAGE:
-		case SCRIPT:
-			xs=map[m].npc[i]->u.scr.xs;
-			ys=map[m].npc[i]->u.scr.ys;
-			break;
-		default:
-			continue;
-		}
-		if (x >= map[m].npc[i]->bl.x-xs/2 && x < map[m].npc[i]->bl.x-xs/2+xs &&
-		   y >= map[m].npc[i]->bl.y-ys/2 && y < map[m].npc[i]->bl.y-ys/2+ys)
-			break;
-	}
-	if (i==map[m].npc_num) {
-		if (f) {
-			if (battle_config.error_log)
-				printf("npc_touch_areanpc : some bug \n");
-		}
-		return 1;
-	}
-	switch(map[m].npc[i]->bl.subtype) {
-	case WARP:
-		skill_stop_dancing(&sd->bl,0);
-		pc_setpos(sd,map[m].npc[i]->u.warp.name,map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0);
-		break;
-	case MESSAGE:
-	case SCRIPT:
-		{
-			char *name=(char *)aCalloc(50,sizeof(char));
-
-			memcpy(name,map[m].npc[i]->name,50);
-			if(sd->areanpc_id==map[m].npc[i]->bl.id)
-				return 1;
-			sd->areanpc_id=map[m].npc[i]->bl.id;
-			if(npc_event(sd,strcat(name,"::OnTouch"),0)>0)
-				npc_click(sd,map[m].npc[i]->bl.id);
-			free(name);
-			break;
-		}
-	}
-	return 0;
+    for (i = 0; i < map[m].npc_num; i++)
+    {
+        if (map[m].npc[i]->flag & 1)
+        {                       // ��������������
+            f = 0;
+            continue;
+        }
+
+        switch (map[m].npc[i]->bl.subtype)
+        {
+            case WARP:
+                xs = map[m].npc[i]->u.warp.xs;
+                ys = map[m].npc[i]->u.warp.ys;
+                break;
+            case MESSAGE:
+            case SCRIPT:
+                xs = map[m].npc[i]->u.scr.xs;
+                ys = map[m].npc[i]->u.scr.ys;
+                break;
+            default:
+                continue;
+        }
+        if (x >= map[m].npc[i]->bl.x - xs / 2
+            && x < map[m].npc[i]->bl.x - xs / 2 + xs
+            && y >= map[m].npc[i]->bl.y - ys / 2
+            && y < map[m].npc[i]->bl.y - ys / 2 + ys)
+            break;
+    }
+    if (i == map[m].npc_num)
+    {
+        if (f)
+        {
+            if (battle_config.error_log)
+                printf ("npc_touch_areanpc : some bug \n");
+        }
+        return 1;
+    }
+    switch (map[m].npc[i]->bl.subtype)
+    {
+        case WARP:
+            skill_stop_dancing (&sd->bl, 0);
+            pc_setpos (sd, map[m].npc[i]->u.warp.name,
+                       map[m].npc[i]->u.warp.x, map[m].npc[i]->u.warp.y, 0);
+            break;
+        case MESSAGE:
+        case SCRIPT:
+        {
+            char *name = (char *) aCalloc (50, sizeof (char));
+
+            memcpy (name, map[m].npc[i]->name, 50);
+            if (sd->areanpc_id == map[m].npc[i]->bl.id)
+                return 1;
+            sd->areanpc_id = map[m].npc[i]->bl.id;
+            if (npc_event (sd, strcat (name, "::OnTouch"), 0) > 0)
+                npc_click (sd, map[m].npc[i]->bl.id);
+            free (name);
+            break;
+        }
+    }
+    return 0;
 }
 
 /*==========================================
  * �߂����ǂ����̔���
  *------------------------------------------
  */
-int npc_checknear(struct map_session_data *sd,int id)
+int npc_checknear (struct map_session_data *sd, int id)
 {
-	struct npc_data *nd;
+    struct npc_data *nd;
 
-	nullpo_retr(0, sd);
+    nullpo_retr (0, sd);
 
-	nd=(struct npc_data *)map_id2bl(id);
-	if (nd==NULL || nd->bl.type!=BL_NPC) {
-		if (battle_config.error_log)
-			printf("no such npc : %d\n",id);
-		return 1;
-	}
-	
-	if (nd->class<0)	// �C�x���g�n�͏���OK
-		return 0;
+    nd = (struct npc_data *) map_id2bl (id);
+    if (nd == NULL || nd->bl.type != BL_NPC)
+    {
+        if (battle_config.error_log)
+            printf ("no such npc : %d\n", id);
+        return 1;
+    }
 
-	// �G���A����
-	if (nd->bl.m!=sd->bl.m ||
-	   nd->bl.x<sd->bl.x-AREA_SIZE-1 || nd->bl.x>sd->bl.x+AREA_SIZE+1 ||
-	   nd->bl.y<sd->bl.y-AREA_SIZE-1 || nd->bl.y>sd->bl.y+AREA_SIZE+1)
-		return 1;
+    if (nd->class < 0)          // �C�x���g�n�͏���OK
+        return 0;
 
-	return 0;
+    // �G���A����
+    if (nd->bl.m != sd->bl.m ||
+        nd->bl.x < sd->bl.x - AREA_SIZE - 1
+        || nd->bl.x > sd->bl.x + AREA_SIZE + 1
+        || nd->bl.y < sd->bl.y - AREA_SIZE - 1
+        || nd->bl.y > sd->bl.y + AREA_SIZE + 1)
+        return 1;
+
+    return 0;
 }
 
 /*==========================================
  * �N���b�N����NPC����
  *------------------------------------------
  */
-int npc_click(struct map_session_data *sd,int id)
+int npc_click (struct map_session_data *sd, int id)
 {
-	struct npc_data *nd;
+    struct npc_data *nd;
 
-	nullpo_retr(1, sd);
+    nullpo_retr (1, sd);
 
-	if (sd->npc_id != 0) {
-		if (battle_config.error_log)
-			printf("npc_click: npc_id != 0\n");
-		return 1;
-	}
+    if (sd->npc_id != 0)
+    {
+        if (battle_config.error_log)
+            printf ("npc_click: npc_id != 0\n");
+        return 1;
+    }
 
-	if (npc_checknear(sd,id))
-		return 1;
+    if (npc_checknear (sd, id))
+        return 1;
 
-	nd=(struct npc_data *)map_id2bl(id);
+    nd = (struct npc_data *) map_id2bl (id);
 
-	if (nd->flag&1)	// ��������������
-		return 1;
+    if (nd->flag & 1)           // ��������������
+        return 1;
 
-	sd->npc_id=id;
-	switch(nd->bl.subtype) {
-	case SHOP:
-		clif_npcbuysell(sd,id);
-		npc_event_dequeue(sd);
-		break;
-	case SCRIPT:
-		sd->npc_pos=run_script(nd->u.scr.script,0,sd->bl.id,id);
-		break;
+    sd->npc_id = id;
+    switch (nd->bl.subtype)
+    {
+        case SHOP:
+            clif_npcbuysell (sd, id);
+            npc_event_dequeue (sd);
+            break;
+        case SCRIPT:
+            sd->npc_pos = run_script (nd->u.scr.script, 0, sd->bl.id, id);
+            break;
         case MESSAGE:
-                if (nd->u.message)
-		{
-                    clif_scriptmes(sd, id, nd->u.message);
-		    clif_scriptclose(sd, id);
-		}
-                break;
-	}
+            if (nd->u.message)
+            {
+                clif_scriptmes (sd, id, nd->u.message);
+                clif_scriptclose (sd, id);
+            }
+            break;
+    }
 
-	return 0;
+    return 0;
 }
 
 /*==========================================
  *
  *------------------------------------------
  */
-int npc_scriptcont(struct map_session_data *sd,int id)
+int npc_scriptcont (struct map_session_data *sd, int id)
 {
-	struct npc_data *nd;
+    struct npc_data *nd;
 
-	nullpo_retr(1, sd);
+    nullpo_retr (1, sd);
 
-	if (id!=sd->npc_id)
-		return 1;
-	if (npc_checknear(sd,id))
-		return 1;
+    if (id != sd->npc_id)
+        return 1;
+    if (npc_checknear (sd, id))
+        return 1;
 
-	nd=(struct npc_data *)map_id2bl(id);
+    nd = (struct npc_data *) map_id2bl (id);
 
-        if (!nd /* NPC was disposed? */ || nd->bl.subtype == MESSAGE) {
-            clif_scriptclose(sd, id);
-            npc_event_dequeue(sd);
-            return 0;
-        }
+    if (!nd /* NPC was disposed? */  || nd->bl.subtype == MESSAGE)
+    {
+        clif_scriptclose (sd, id);
+        npc_event_dequeue (sd);
+        return 0;
+    }
 
-	sd->npc_pos=run_script(nd->u.scr.script,sd->npc_pos,sd->bl.id,id);
+    sd->npc_pos = run_script (nd->u.scr.script, sd->npc_pos, sd->bl.id, id);
 
-	return 0;
+    return 0;
 }
 
 /*==========================================
  *
  *------------------------------------------
  */
-int npc_buysellsel(struct map_session_data *sd,int id,int type)
+int npc_buysellsel (struct map_session_data *sd, int id, int type)
 {
-	struct npc_data *nd;
+    struct npc_data *nd;
 
-	nullpo_retr(1, sd);
+    nullpo_retr (1, sd);
 
-	if (npc_checknear(sd,id))
-		return 1;
+    if (npc_checknear (sd, id))
+        return 1;
 
-	nd=(struct npc_data *)map_id2bl(id);
-	if (nd->bl.subtype!=SHOP) {
-		if (battle_config.error_log)
-			printf("no such shop npc : %d\n",id);
-		sd->npc_id=0;
-		return 1;
-	}
-	if (nd->flag&1)	// ��������������
-		return 1;
-
-	sd->npc_shopid=id;
-	if (type==0) {
-		clif_buylist(sd,nd);
-	} else {
-		clif_selllist(sd);
-	}
-	return 0;
+    nd = (struct npc_data *) map_id2bl (id);
+    if (nd->bl.subtype != SHOP)
+    {
+        if (battle_config.error_log)
+            printf ("no such shop npc : %d\n", id);
+        sd->npc_id = 0;
+        return 1;
+    }
+    if (nd->flag & 1)           // ��������������
+        return 1;
+
+    sd->npc_shopid = id;
+    if (type == 0)
+    {
+        clif_buylist (sd, nd);
+    }
+    else
+    {
+        clif_selllist (sd);
+    }
+    return 0;
 }
 
 /*==========================================
  *
  *------------------------------------------
  */
-int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
+int npc_buylist (struct map_session_data *sd, int n,
+                 unsigned short *item_list)
 {
-	struct npc_data *nd;
-	double z;
-	int i,j,w,skill,itemamount=0,new=0;
+    struct npc_data *nd;
+    double z;
+    int  i, j, w, skill, itemamount = 0, new = 0;
 
-	nullpo_retr(3, sd);
-	nullpo_retr(3, item_list);
+    nullpo_retr (3, sd);
+    nullpo_retr (3, item_list);
 
-	if (npc_checknear(sd,sd->npc_shopid))
-		return 3;
+    if (npc_checknear (sd, sd->npc_shopid))
+        return 3;
 
-	nd=(struct npc_data*)map_id2bl(sd->npc_shopid);
-	if (nd->bl.subtype!=SHOP)
-		return 3;
+    nd = (struct npc_data *) map_id2bl (sd->npc_shopid);
+    if (nd->bl.subtype != SHOP)
+        return 3;
 
-	for(i=0,w=0,z=0;i<n;i++) {
-		for(j=0;nd->u.shop_item[j].nameid;j++) {
-			if (nd->u.shop_item[j].nameid==item_list[i*2+1])
-				break;
-		}
-		if (nd->u.shop_item[j].nameid==0)
-			return 3;
-
-		if (itemdb_value_notdc(nd->u.shop_item[j].nameid))
-			z+=(double)nd->u.shop_item[j].value * item_list[i*2];
-		else
-			z+=(double)pc_modifybuyvalue(sd,nd->u.shop_item[j].value) * item_list[i*2];
-		itemamount+=item_list[i*2];
-
-		switch(pc_checkadditem(sd,item_list[i*2+1],item_list[i*2])) {
-		case ADDITEM_EXIST:
-			break;
-		case ADDITEM_NEW:
-			if (itemdb_isequip(item_list[i*2+1]))
-			    new += item_list[i*2];
-			else
-			    new++;
-			break;
-		case ADDITEM_OVERAMOUNT:
-			return 2;
-		}
+    for (i = 0, w = 0, z = 0; i < n; i++)
+    {
+        for (j = 0; nd->u.shop_item[j].nameid; j++)
+        {
+            if (nd->u.shop_item[j].nameid == item_list[i * 2 + 1])
+                break;
+        }
+        if (nd->u.shop_item[j].nameid == 0)
+            return 3;
+
+        if (itemdb_value_notdc (nd->u.shop_item[j].nameid))
+            z += (double) nd->u.shop_item[j].value * item_list[i * 2];
+        else
+            z += (double) pc_modifybuyvalue (sd,
+                                             nd->u.shop_item[j].value) *
+                item_list[i * 2];
+        itemamount += item_list[i * 2];
+
+        switch (pc_checkadditem (sd, item_list[i * 2 + 1], item_list[i * 2]))
+        {
+            case ADDITEM_EXIST:
+                break;
+            case ADDITEM_NEW:
+                if (itemdb_isequip (item_list[i * 2 + 1]))
+                    new += item_list[i * 2];
+                else
+                    new++;
+                break;
+            case ADDITEM_OVERAMOUNT:
+                return 2;
+        }
 
-		w+=itemdb_weight(item_list[i*2+1]) * item_list[i*2];
-	}
+        w += itemdb_weight (item_list[i * 2 + 1]) * item_list[i * 2];
+    }
 
-	if (z > (double)sd->status.zeny)
-		return 1;	// zeny�s��
-	if (w+sd->weight > sd->max_weight)
-		return 2;	// �d�ʒ���
-	if (pc_inventoryblank(sd)<new)
-		return 3;	// ���ސ�����
-	if (sd->trade_partner != 0)
-		return 4;	// cant buy while trading
-
-	pc_payzeny(sd,(int)z);
-
-	for(i=0;i<n;i++) {
-		struct item_data *item_data;
-		if ((item_data = itemdb_exists(item_list[i*2+1])) != NULL)
-		{
-			int amount = item_list[i*2];
-			struct item item_tmp;
-			memset(&item_tmp,0,sizeof(item_tmp));
-
-			item_tmp.nameid = item_data->nameid;
-			item_tmp.identify = 1;	// npc�̔��A�C�e���͊Ӓ��ς�
-
-			if (amount > 1 && (item_data->type == 4 || item_data->type == 5 || item_data->type == 7 || item_data->type == 8))
-			{
-				for (j=0; j<amount; j++) {
-					pc_additem(sd,&item_tmp,1);
-				}
-			}
-			else {
-				pc_additem(sd,&item_tmp,amount);
-			}
-		}
-	}
+    if (z > (double) sd->status.zeny)
+        return 1;               // zeny�s��
+    if (w + sd->weight > sd->max_weight)
+        return 2;               // �d�ʒ���
+    if (pc_inventoryblank (sd) < new)
+        return 3;               // ���ސ�����
+    if (sd->trade_partner != 0)
+        return 4;               // cant buy while trading
+
+    pc_payzeny (sd, (int) z);
+
+    for (i = 0; i < n; i++)
+    {
+        struct item_data *item_data;
+        if ((item_data = itemdb_exists (item_list[i * 2 + 1])) != NULL)
+        {
+            int  amount = item_list[i * 2];
+            struct item item_tmp;
+            memset (&item_tmp, 0, sizeof (item_tmp));
+
+            item_tmp.nameid = item_data->nameid;
+            item_tmp.identify = 1;  // npc�̔��A�C�e���͊Ӓ��ς�
+
+            if (amount > 1
+                && (item_data->type == 4 || item_data->type == 5
+                    || item_data->type == 7 || item_data->type == 8))
+            {
+                for (j = 0; j < amount; j++)
+                {
+                    pc_additem (sd, &item_tmp, 1);
+                }
+            }
+            else
+            {
+                pc_additem (sd, &item_tmp, amount);
+            }
+        }
+    }
 
-	//���l�o���l
+    //���l�o���l
 /*	if ((sd->status.class == 5) || (sd->status.class == 10) || (sd->status.class == 18)) {
 		z = z * pc_checkskill(sd,MC_DISCOUNT) / ((1 + 300 / itemamount) * 4000) * battle_config.shop_exp;
 		pc_gainexp(sd,0,z);
 	}*/
-	if (battle_config.shop_exp > 0 && z > 0 && (skill = pc_checkskill(sd,MC_DISCOUNT)) > 0) {
-		if (skill > 0) {
-			z = (log(z * (double)skill) * (double)battle_config.shop_exp/100.);
-			if (z < 1)
-				z = 1;
-			pc_gainexp(sd,0,(int)z);
-		}
-	}
+    if (battle_config.shop_exp > 0 && z > 0
+        && (skill = pc_checkskill (sd, MC_DISCOUNT)) > 0)
+    {
+        if (skill > 0)
+        {
+            z = (log (z * (double) skill) * (double) battle_config.shop_exp /
+                 100.);
+            if (z < 1)
+                z = 1;
+            pc_gainexp (sd, 0, (int) z);
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 /*==========================================
  *
  *------------------------------------------
  */
-int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
+int npc_selllist (struct map_session_data *sd, int n,
+                  unsigned short *item_list)
 {
-	double z;
-	int i,skill,itemamount=0;
-
-	nullpo_retr(1, sd);
-	nullpo_retr(1, item_list);
-
-	if (npc_checknear(sd,sd->npc_shopid))
-		return 1;
-	for(i=0,z=0;i<n;i++) {
-		int nameid;
-		if (item_list[i*2]-2 <0 || item_list[i*2]-2 >=MAX_INVENTORY)
-			return 1;
-		nameid=sd->status.inventory[item_list[i*2]-2].nameid;
-		if (nameid == 0 ||
-		   sd->status.inventory[item_list[i*2]-2].amount < item_list[i*2+1])
-			return 1;
-		if (sd->trade_partner != 0)
-			return 2; // cant sell while trading
-		if (itemdb_value_notoc(nameid))
-			z+=(double)itemdb_value_sell(nameid) * item_list[i*2+1];
-		else
-			z+=(double)pc_modifysellvalue(sd,itemdb_value_sell(nameid)) * item_list[i*2+1];
-		itemamount+=item_list[i*2+1];
-	}
+    double z;
+    int  i, skill, itemamount = 0;
 
-	if (z > MAX_ZENY) z = MAX_ZENY;
-	pc_getzeny(sd,(int)z);
-	for(i=0;i<n;i++) {
-		int item_id=item_list[i*2]-2;
-		pc_delitem(sd,item_id,item_list[i*2+1],0);
-	}
+    nullpo_retr (1, sd);
+    nullpo_retr (1, item_list);
+
+    if (npc_checknear (sd, sd->npc_shopid))
+        return 1;
+    for (i = 0, z = 0; i < n; i++)
+    {
+        int  nameid;
+        if (item_list[i * 2] - 2 < 0 || item_list[i * 2] - 2 >= MAX_INVENTORY)
+            return 1;
+        nameid = sd->status.inventory[item_list[i * 2] - 2].nameid;
+        if (nameid == 0 ||
+            sd->status.inventory[item_list[i * 2] - 2].amount <
+            item_list[i * 2 + 1])
+            return 1;
+        if (sd->trade_partner != 0)
+            return 2;           // cant sell while trading
+        if (itemdb_value_notoc (nameid))
+            z += (double) itemdb_value_sell (nameid) * item_list[i * 2 + 1];
+        else
+            z += (double) pc_modifysellvalue (sd,
+                                              itemdb_value_sell (nameid)) *
+                item_list[i * 2 + 1];
+        itemamount += item_list[i * 2 + 1];
+    }
+
+    if (z > MAX_ZENY)
+        z = MAX_ZENY;
+    pc_getzeny (sd, (int) z);
+    for (i = 0; i < n; i++)
+    {
+        int  item_id = item_list[i * 2] - 2;
+        pc_delitem (sd, item_id, item_list[i * 2 + 1], 0);
+    }
 
-	//���l�o���l
+    //���l�o���l
 /*	if ((sd->status.class == 5) || (sd->status.class == 10) || (sd->status.class == 18)) {
 		z = z * pc_checkskill(sd,MC_OVERCHARGE) / ((1 + 500 / itemamount) * 4000) * battle_config.shop_exp ;
 		pc_gainexp(sd,0,z);
 	}*/
-	if (battle_config.shop_exp > 0 && z > 0 && (skill = pc_checkskill(sd,MC_OVERCHARGE)) > 0) {
-		if (skill > 0) {
-			z = (log(z * (double)skill) * (double)battle_config.shop_exp/100.);
-			if (z < 1)
-				z = 1;
-			pc_gainexp(sd,0,(int)z);
-		}
-	}
+    if (battle_config.shop_exp > 0 && z > 0
+        && (skill = pc_checkskill (sd, MC_OVERCHARGE)) > 0)
+    {
+        if (skill > 0)
+        {
+            z = (log (z * (double) skill) * (double) battle_config.shop_exp /
+                 100.);
+            if (z < 1)
+                z = 1;
+            pc_gainexp (sd, 0, (int) z);
+        }
+    }
 
-	return 0;
+    return 0;
 
 }
 
@@ -1071,1019 +1200,1208 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
  * �ǂݍ���npc�t�@�C���̃N���A
  *------------------------------------------
  */
-void npc_clearsrcfile()
+void npc_clearsrcfile ()
 {
-	struct npc_src_list *p=npc_src_first;
+    struct npc_src_list *p = npc_src_first;
 
-	while( p ) {
-		struct npc_src_list *p2=p;
-		p=p->next;
-		free(p2);
-	}
-	npc_src_first=NULL;
-	npc_src_last=NULL;
+    while (p)
+    {
+        struct npc_src_list *p2 = p;
+        p = p->next;
+        free (p2);
+    }
+    npc_src_first = NULL;
+    npc_src_last = NULL;
 }
+
 /*==========================================
  * �ǂݍ���npc�t�@�C���̒lj�
  *------------------------------------------
  */
-void npc_addsrcfile(char *name)
+void npc_addsrcfile (char *name)
 {
-	struct npc_src_list *new;
-	size_t len;
+    struct npc_src_list *new;
+    size_t len;
 
-	if ( strcmpi(name,"clear")==0 ) {
-		npc_clearsrcfile();
-		return;
-	}
+    if (strcmpi (name, "clear") == 0)
+    {
+        npc_clearsrcfile ();
+        return;
+    }
 
-	len = sizeof(*new) + strlen(name);
-	new=(struct npc_src_list *)aCalloc(1,len);
-	new->next = NULL;
-	strncpy(new->name,name,strlen(name)+1);
-	if (npc_src_first==NULL)
-		npc_src_first = new;
-	if (npc_src_last)
-		npc_src_last->next = new;
+    len = sizeof (*new) + strlen (name);
+    new = (struct npc_src_list *) aCalloc (1, len);
+    new->next = NULL;
+    strncpy (new->name, name, strlen (name) + 1);
+    if (npc_src_first == NULL)
+        npc_src_first = new;
+    if (npc_src_last)
+        npc_src_last->next = new;
 
-	npc_src_last=new;
+    npc_src_last = new;
 }
+
 /*==========================================
  * �ǂݍ���npc�t�@�C���̍폜
  *------------------------------------------
  */
-void npc_delsrcfile(char *name)
+void npc_delsrcfile (char *name)
 {
-	struct npc_src_list *p=npc_src_first,*pp=NULL,**lp=&npc_src_first;
+    struct npc_src_list *p = npc_src_first, *pp = NULL, **lp = &npc_src_first;
 
-	if ( strcmpi(name,"all")==0 ) {
-		npc_clearsrcfile();
-		return;
-	}
+    if (strcmpi (name, "all") == 0)
+    {
+        npc_clearsrcfile ();
+        return;
+    }
 
-	for( ; p; lp=&p->next,pp=p,p=p->next ) {
-		if ( strcmp(p->name,name)==0 ) {
-			*lp=p->next;
-			if ( npc_src_last==p )
-				npc_src_last=pp;
-			free(p);
-			break;
-		}
-	}
+    for (; p; lp = &p->next, pp = p, p = p->next)
+    {
+        if (strcmp (p->name, name) == 0)
+        {
+            *lp = p->next;
+            if (npc_src_last == p)
+                npc_src_last = pp;
+            free (p);
+            break;
+        }
+    }
 }
 
 /*==========================================
  * warp�s����
  *------------------------------------------
  */
-int npc_parse_warp(char *w1,char *w2,char *w3,char *w4)
+int npc_parse_warp (char *w1, char *w2, char *w3, char *w4)
 {
-	int x,y,xs,ys,to_x,to_y,m;
-	int i,j;
-	char mapname[24],to_mapname[24];
-	struct npc_data *nd;
-
-	// �����̌��`�F�b�N
-	if (sscanf(w1,"%[^,],%d,%d",mapname,&x,&y) != 3 ||
-	   sscanf(w4,"%d,%d,%[^,],%d,%d",&xs,&ys,to_mapname,&to_x,&to_y) != 5) {
-		printf("bad warp line : %s\n",w3);
-		return 1;
-	}
+    int  x, y, xs, ys, to_x, to_y, m;
+    int  i, j;
+    char mapname[24], to_mapname[24];
+    struct npc_data *nd;
+
+    // �����̌��`�F�b�N
+    if (sscanf (w1, "%[^,],%d,%d", mapname, &x, &y) != 3 ||
+        sscanf (w4, "%d,%d,%[^,],%d,%d", &xs, &ys, to_mapname, &to_x,
+                &to_y) != 5)
+    {
+        printf ("bad warp line : %s\n", w3);
+        return 1;
+    }
 
-	m=map_mapname2mapid(mapname);
-
-	nd=(struct npc_data *)aCalloc(1,sizeof(struct npc_data));
-	nd->bl.id=npc_get_new_npc_id();
-	nd->n=map_addnpc(m,nd);
-
-	nd->bl.prev = nd->bl.next = NULL;
-	nd->bl.m=m;
-	nd->bl.x=x;
-	nd->bl.y=y;
-	nd->dir=0;
-	nd->flag=0;
-	memcpy(nd->name,w3,24);
-	memcpy(nd->exname,w3,24);
-
-	nd->chat_id=0;
-	if (!battle_config.warp_point_debug)
-		nd->class=WARP_CLASS;
-	else
-		nd->class=WARP_DEBUG_CLASS;
-	nd->speed=200;
-	nd->option = 0;
-	nd->opt1 = 0;
-	nd->opt2 = 0;
-	nd->opt3 = 0;
-	memcpy(nd->u.warp.name,to_mapname,16);
-	xs+=2; ys+=2;
-	nd->u.warp.x=to_x;
-	nd->u.warp.y=to_y;
-	nd->u.warp.xs=xs;
-	nd->u.warp.ys=ys;
-
-	for(i=0;i<ys;i++) {
-		for(j=0;j<xs;j++) {
-			int t;
-			t=map_getcell(m,x-xs/2+j,y-ys/2+i);
-			if (t==1 || t==5)
-				continue;
-			map_setcell(m,x-xs/2+j,y-ys/2+i,t|0x80);
-		}
-	}
+    m = map_mapname2mapid (mapname);
+
+    nd = (struct npc_data *) aCalloc (1, sizeof (struct npc_data));
+    nd->bl.id = npc_get_new_npc_id ();
+    nd->n = map_addnpc (m, nd);
+
+    nd->bl.prev = nd->bl.next = NULL;
+    nd->bl.m = m;
+    nd->bl.x = x;
+    nd->bl.y = y;
+    nd->dir = 0;
+    nd->flag = 0;
+    memcpy (nd->name, w3, 24);
+    memcpy (nd->exname, w3, 24);
+
+    nd->chat_id = 0;
+    if (!battle_config.warp_point_debug)
+        nd->class = WARP_CLASS;
+    else
+        nd->class = WARP_DEBUG_CLASS;
+    nd->speed = 200;
+    nd->option = 0;
+    nd->opt1 = 0;
+    nd->opt2 = 0;
+    nd->opt3 = 0;
+    memcpy (nd->u.warp.name, to_mapname, 16);
+    xs += 2;
+    ys += 2;
+    nd->u.warp.x = to_x;
+    nd->u.warp.y = to_y;
+    nd->u.warp.xs = xs;
+    nd->u.warp.ys = ys;
+
+    for (i = 0; i < ys; i++)
+    {
+        for (j = 0; j < xs; j++)
+        {
+            int  t;
+            t = map_getcell (m, x - xs / 2 + j, y - ys / 2 + i);
+            if (t == 1 || t == 5)
+                continue;
+            map_setcell (m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80);
+        }
+    }
 
-//	printf("warp npc %s %d read done\n",mapname,nd->bl.id);
-	npc_warp++;
-	nd->bl.type=BL_NPC;
-	nd->bl.subtype=WARP;
-	map_addblock(&nd->bl);
-	clif_spawnnpc(nd);
-	strdb_insert(npcname_db,nd->name,nd);
+//  printf("warp npc %s %d read done\n",mapname,nd->bl.id);
+    npc_warp++;
+    nd->bl.type = BL_NPC;
+    nd->bl.subtype = WARP;
+    map_addblock (&nd->bl);
+    clif_spawnnpc (nd);
+    strdb_insert (npcname_db, nd->name, nd);
 
-	return 0;
+    return 0;
 }
 
 /*==========================================
  * shop�s����
  *------------------------------------------
  */
-static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
+static int npc_parse_shop (char *w1, char *w2, char *w3, char *w4)
 {
-	char *p;
-	int x, y, dir, m;
-	int max = 100, pos = 0;
-	char mapname[24];
-	struct npc_data *nd;
-
-	// �����̌��`�F�b�N
-	if (sscanf(w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 ||
-	    strchr(w4, ',') == NULL) {
-		printf("bad shop line : %s\n", w3);
-		return 1;
-	}
-	m = map_mapname2mapid(mapname);
-
-	nd = (struct npc_data *)aCalloc(1,sizeof(struct npc_data) +
-		sizeof(nd->u.shop_item[0]) * (max + 1));
-	p = strchr(w4, ',');
-
-	while (p && pos < max) {
-		int nameid,value;
-		char name[24];
-		struct item_data *id = NULL;
-		p++;
-		if (sscanf(p, "%d:%d", &nameid, &value) == 2) {
-		} else if (sscanf(p, "%s :%d", name, &value) == 2) {
-			id = itemdb_searchname(name);
-			if (id == NULL) nameid = -1;
-			else nameid = id->nameid;
-		} else break;
-
-		if (nameid > 0) {
-			nd->u.shop_item[pos].nameid = nameid;
-			if (value < 0) {
-				if (id == NULL) id = itemdb_search(nameid);
-				value = id->value_buy * abs(value);
-
-			}
-			nd->u.shop_item[pos].value = value;
-			pos++;
-		}
-		p=strchr(p,',');
-	}
-	if (pos == 0) {
-		free(nd);
-		return 1;
-	}
-	nd->u.shop_item[pos++].nameid = 0;
-
-	nd->bl.prev = nd->bl.next = NULL;
-	nd->bl.m = m;
-	nd->bl.x = x;
-	nd->bl.y = y;
-	nd->bl.id = npc_get_new_npc_id();
-	nd->dir = dir;
-	nd->flag = 0;
-	memcpy(nd->name, w3, 24);
-	nd->class = atoi(w4);
-	nd->speed = 200;
-	nd->chat_id = 0;
-	nd->option = 0;
-	nd->opt1 = 0;
-	nd->opt2 = 0;
-	nd->opt3 = 0;
-	
-	nd = (struct npc_data *)aRealloc(nd,
-		sizeof(struct npc_data) + sizeof(nd->u.shop_item[0]) * pos);
-
-	//printf("shop npc %s %d read done\n",mapname,nd->bl.id);
-	npc_shop++;
-	nd->bl.type=BL_NPC;
-	nd->bl.subtype=SHOP;
-	nd->n=map_addnpc(m,nd);
-	map_addblock(&nd->bl);
-	clif_spawnnpc(nd);
-	strdb_insert(npcname_db,nd->name,nd);
+    char *p;
+    int  x, y, dir, m;
+    int  max = 100, pos = 0;
+    char mapname[24];
+    struct npc_data *nd;
+
+    // �����̌��`�F�b�N
+    if (sscanf (w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 ||
+        strchr (w4, ',') == NULL)
+    {
+        printf ("bad shop line : %s\n", w3);
+        return 1;
+    }
+    m = map_mapname2mapid (mapname);
+
+    nd = (struct npc_data *) aCalloc (1, sizeof (struct npc_data) +
+                                      sizeof (nd->u.shop_item[0]) * (max +
+                                                                     1));
+    p = strchr (w4, ',');
+
+    while (p && pos < max)
+    {
+        int  nameid, value;
+        char name[24];
+        struct item_data *id = NULL;
+        p++;
+        if (sscanf (p, "%d:%d", &nameid, &value) == 2)
+        {
+        }
+        else if (sscanf (p, "%s :%d", name, &value) == 2)
+        {
+            id = itemdb_searchname (name);
+            if (id == NULL)
+                nameid = -1;
+            else
+                nameid = id->nameid;
+        }
+        else
+            break;
+
+        if (nameid > 0)
+        {
+            nd->u.shop_item[pos].nameid = nameid;
+            if (value < 0)
+            {
+                if (id == NULL)
+                    id = itemdb_search (nameid);
+                value = id->value_buy * abs (value);
 
-	return 0;
+            }
+            nd->u.shop_item[pos].value = value;
+            pos++;
+        }
+        p = strchr (p, ',');
+    }
+    if (pos == 0)
+    {
+        free (nd);
+        return 1;
+    }
+    nd->u.shop_item[pos++].nameid = 0;
+
+    nd->bl.prev = nd->bl.next = NULL;
+    nd->bl.m = m;
+    nd->bl.x = x;
+    nd->bl.y = y;
+    nd->bl.id = npc_get_new_npc_id ();
+    nd->dir = dir;
+    nd->flag = 0;
+    memcpy (nd->name, w3, 24);
+    nd->class = atoi (w4);
+    nd->speed = 200;
+    nd->chat_id = 0;
+    nd->option = 0;
+    nd->opt1 = 0;
+    nd->opt2 = 0;
+    nd->opt3 = 0;
+
+    nd = (struct npc_data *) aRealloc (nd,
+                                       sizeof (struct npc_data) +
+                                       sizeof (nd->u.shop_item[0]) * pos);
+
+    //printf("shop npc %s %d read done\n",mapname,nd->bl.id);
+    npc_shop++;
+    nd->bl.type = BL_NPC;
+    nd->bl.subtype = SHOP;
+    nd->n = map_addnpc (m, nd);
+    map_addblock (&nd->bl);
+    clif_spawnnpc (nd);
+    strdb_insert (npcname_db, nd->name, nd);
+
+    return 0;
 }
+
 /*==========================================
  * NPC�̃��x���f�[�^�R���o�[�g
  *------------------------------------------
  */
-int npc_convertlabel_db(void *key,void *data,va_list ap)
+int npc_convertlabel_db (void *key, void *data, va_list ap)
 {
-	char *lname=(char *)key;
-	int pos=(int)data;
-	struct npc_data *nd;
-	struct npc_label_list *lst;
-	int num;
-	char *p=strchr(lname,':');
-	
-	nullpo_retr(0, ap);
-	nullpo_retr(0, nd=va_arg(ap,struct npc_data *));
-
-	lst=nd->u.scr.label_list;
-	num=nd->u.scr.label_list_num;
-	if(!lst){
-		lst=(struct npc_label_list *)aCalloc(1,sizeof(struct npc_label_list));
-		num=0;
-	}else
-		lst=(struct npc_label_list *)aRealloc(lst,sizeof(struct npc_label_list)*(num+1));
-
-	*p='\0';
-	strncpy(lst[num].name,lname,24);
-	*p=':';
-	lst[num].pos=pos;
-	nd->u.scr.label_list=lst;
-	nd->u.scr.label_list_num=num+1;
-	return 0;
+    char *lname = (char *) key;
+    int  pos = (int) data;
+    struct npc_data *nd;
+    struct npc_label_list *lst;
+    int  num;
+    char *p = strchr (lname, ':');
+
+    nullpo_retr (0, ap);
+    nullpo_retr (0, nd = va_arg (ap, struct npc_data *));
+
+    lst = nd->u.scr.label_list;
+    num = nd->u.scr.label_list_num;
+    if (!lst)
+    {
+        lst =
+            (struct npc_label_list *) aCalloc (1,
+                                               sizeof (struct
+                                                       npc_label_list));
+        num = 0;
+    }
+    else
+        lst =
+            (struct npc_label_list *) aRealloc (lst,
+                                                sizeof (struct npc_label_list)
+                                                * (num + 1));
+
+    *p = '\0';
+    strncpy (lst[num].name, lname, 24);
+    *p = ':';
+    lst[num].pos = pos;
+    nd->u.scr.label_list = lst;
+    nd->u.scr.label_list_num = num + 1;
+    return 0;
 }
+
 /*==========================================
  * script�s����
  *------------------------------------------
  */
-static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line,FILE *fp,int *lines)
+static int npc_parse_script (char *w1, char *w2, char *w3, char *w4,
+                             char *first_line, FILE * fp, int *lines)
 {
-	int x,y,dir=0,m,xs=0,ys=0,class=0;	// [Valaris] thanks to fov
-	char mapname[24];
-	unsigned char *srcbuf=NULL,*script;
-	int srcsize=65536;
-	int startline=0;
-	unsigned char line[1024];
-	int i;
-	struct npc_data *nd;
-	int evflag=0;
-	struct dbt *label_db;
-	char *p;
-	struct npc_label_list *label_dup=NULL;
-	int label_dupnum=0;
-	int src_id=0;
-
-	if(strcmp(w1,"-")==0){
-		x=0;y=0;m=-1;
-	}else{
-	// �����̌��`�F�b�N
-	if (sscanf(w1,"%[^,],%d,%d,%d",mapname,&x,&y,&dir) != 4 ||
-		   ( strcmp(w2,"script")==0 && strchr(w4,',')==NULL) ) {
-		printf("bad script line : %s\n",w3);
-		return 1;
-	}
-	m = map_mapname2mapid(mapname);
-	}
+    int  x, y, dir = 0, m, xs = 0, ys = 0, class = 0;   // [Valaris] thanks to fov
+    char mapname[24];
+    unsigned char *srcbuf = NULL, *script;
+    int  srcsize = 65536;
+    int  startline = 0;
+    unsigned char line[1024];
+    int  i;
+    struct npc_data *nd;
+    int  evflag = 0;
+    struct dbt *label_db;
+    char *p;
+    struct npc_label_list *label_dup = NULL;
+    int  label_dupnum = 0;
+    int  src_id = 0;
+
+    if (strcmp (w1, "-") == 0)
+    {
+        x = 0;
+        y = 0;
+        m = -1;
+    }
+    else
+    {
+        // �����̌��`�F�b�N
+        if (sscanf (w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 ||
+            (strcmp (w2, "script") == 0 && strchr (w4, ',') == NULL))
+        {
+            printf ("bad script line : %s\n", w3);
+            return 1;
+        }
+        m = map_mapname2mapid (mapname);
+    }
 
-	if(strcmp(w2,"script")==0){
-		// �X�N���v�g�̉���
-		srcbuf=(char *)aCalloc(srcsize,sizeof(char));
-	if (strchr(first_line,'{')) {
-		strcpy(srcbuf,strchr(first_line,'{'));
-		startline=*lines;
-	} else
-		srcbuf[0]=0;
-	while(1) {
-		for(i=strlen(srcbuf)-1;i>=0 && isspace(srcbuf[i]);i--);
-		if (i>=0 && srcbuf[i]=='}')
-			break;
-		fgets(line,1020,fp);
-		(*lines)++;
-		if (feof(fp))
-			break;
-		if (strlen(srcbuf)+strlen(line)+1>=srcsize) {
-			srcsize += 65536;
-				srcbuf = (char *)aRealloc(srcbuf, srcsize);
-			memset(srcbuf + srcsize - 65536, '\0', 65536);
-		}
-		if (srcbuf[0]!='{') {
-			if (strchr(line,'{')) {
-				strcpy(srcbuf,strchr(line,'{'));
-				startline=*lines;
-			}
-		} else
-			strcat(srcbuf,line);
-	}
-	script=parse_script(srcbuf,startline);
-	if (script==NULL) {
-		// script parse error?
-		free(srcbuf);
-		return 1;
-	}
+    if (strcmp (w2, "script") == 0)
+    {
+        // �X�N���v�g�̉���
+        srcbuf = (char *) aCalloc (srcsize, sizeof (char));
+        if (strchr (first_line, '{'))
+        {
+            strcpy (srcbuf, strchr (first_line, '{'));
+            startline = *lines;
+        }
+        else
+            srcbuf[0] = 0;
+        while (1)
+        {
+            for (i = strlen (srcbuf) - 1; i >= 0 && isspace (srcbuf[i]); i--);
+            if (i >= 0 && srcbuf[i] == '}')
+                break;
+            fgets (line, 1020, fp);
+            (*lines)++;
+            if (feof (fp))
+                break;
+            if (strlen (srcbuf) + strlen (line) + 1 >= srcsize)
+            {
+                srcsize += 65536;
+                srcbuf = (char *) aRealloc (srcbuf, srcsize);
+                memset (srcbuf + srcsize - 65536, '\0', 65536);
+            }
+            if (srcbuf[0] != '{')
+            {
+                if (strchr (line, '{'))
+                {
+                    strcpy (srcbuf, strchr (line, '{'));
+                    startline = *lines;
+                }
+            }
+            else
+                strcat (srcbuf, line);
+        }
+        script = parse_script (srcbuf, startline);
+        if (script == NULL)
+        {
+            // script parse error?
+            free (srcbuf);
+            return 1;
+        }
 
-	}else{
-		// duplicate����
-		
-		char srcname[128];
-		struct npc_data *nd2;
-		if( sscanf(w2,"duplicate(%[^)])",srcname)!=1 ){
-			printf("bad duplicate name! : %s",w2);
-			return 0;
-		}
-		if( (nd2=npc_name2id(srcname))==NULL ){
-			printf("bad duplicate name! (not exist) : %s\n",srcname);
-			return 0;
-		}
-		script=nd2->u.scr.script;
-		label_dup=nd2->u.scr.label_list;
-		label_dupnum=nd2->u.scr.label_list_num;
-		src_id=nd2->bl.id;
-	
-	}// end of �X�N���v�g����
-
-	nd=(struct npc_data *)aCalloc(1,sizeof(struct npc_data));
-
-	if(m==-1){
-		// �X�N���v�g�R�s�[�p�̃_�~�[NPC
-		
-	}else if( sscanf(w4,"%d,%d,%d",&class,&xs,&ys)==3) {
-		// �ڐG�^NPC
-		int i,j;
-		
-		if (xs>=0)xs=xs*2+1;
-		if (ys>=0)ys=ys*2+1;
-		
-		if (class>=0) {
-
-			for(i=0;i<ys;i++) {
-				for(j=0;j<xs;j++) {
-					int t;
-					t=map_getcell(m,x-xs/2+j,y-ys/2+i);
-					if (t==1 || t==5)
-						continue;
-					map_setcell(m,x-xs/2+j,y-ys/2+i,t|0x80);
-				}
-			}
-		}
-		
-		nd->u.scr.xs=xs;
-		nd->u.scr.ys=ys;
-	} else {	// �N���b�N�^NPC
-		class=atoi(w4);
-		nd->u.scr.xs=0;
-		nd->u.scr.ys=0;
-	}
-	
-	if (class<0 && m>=0) {	// �C�x���g�^NPC
-		evflag=1;
-	}
+    }
+    else
+    {
+        // duplicate����
+
+        char srcname[128];
+        struct npc_data *nd2;
+        if (sscanf (w2, "duplicate(%[^)])", srcname) != 1)
+        {
+            printf ("bad duplicate name! : %s", w2);
+            return 0;
+        }
+        if ((nd2 = npc_name2id (srcname)) == NULL)
+        {
+            printf ("bad duplicate name! (not exist) : %s\n", srcname);
+            return 0;
+        }
+        script = nd2->u.scr.script;
+        label_dup = nd2->u.scr.label_list;
+        label_dupnum = nd2->u.scr.label_list_num;
+        src_id = nd2->bl.id;
 
-	while((p=strchr(w3,':'))) {
-		if (p[1]==':') break;
-	}
-	if (p) {
-		*p=0;
-		memcpy(nd->name,w3,24);
-		memcpy(nd->exname,p+2,24);
-	}else{
-		memcpy(nd->name,w3,24);
-		memcpy(nd->exname,w3,24);
-	}
+    }                           // end of �X�N���v�g����
 
-	nd->bl.prev = nd->bl.next = NULL;
-	nd->bl.m = m;
-	nd->bl.x = x;
-	nd->bl.y = y;
-	nd->bl.id=npc_get_new_npc_id();
-	nd->dir = dir;
-	nd->flag=0;
-	nd->class=class;
-	nd->speed=200;
-	nd->u.scr.script=script;
-	nd->u.scr.src_id=src_id;
-	nd->chat_id=0;
-	nd->option = 0;
-	nd->opt1 = 0;
-	nd->opt2 = 0;
-	nd->opt3 = 0;
-
-	//printf("script npc %s %d %d read done\n",mapname,nd->bl.id,nd->class);
-	npc_script++;
-	nd->bl.type=BL_NPC;
-	nd->bl.subtype=SCRIPT;
-	if(m>=0){
-	nd->n=map_addnpc(m,nd);
-	map_addblock(&nd->bl);
-
-	if (evflag) {	// �C�x���g�^
-			struct event_data *ev=(struct event_data *)aCalloc(1,sizeof(struct event_data));
-			ev->nd=nd;
-			ev->pos=0;
-			strdb_insert(ev_db,nd->exname,ev);
-		}else
-		clif_spawnnpc(nd);
-	}
-	strdb_insert(npcname_db,nd->exname,nd);
+    nd = (struct npc_data *) aCalloc (1, sizeof (struct npc_data));
 
+    if (m == -1)
+    {
+        // �X�N���v�g�R�s�[�p�̃_�~�[NPC
 
-	//-----------------------------------------
-	// ���x���f�[�^�̏���	
-	if(srcbuf){
-		// script�{�̂������ꍇ�̏���
-		
-		// ���x���f�[�^�̃R���o�[�g
-	label_db=script_get_label_db();
-		strdb_foreach(label_db,npc_convertlabel_db,nd);
-	
-		// ���g���Ȃ��̂Ńo�b�t�@����
-		free(srcbuf);
+    }
+    else if (sscanf (w4, "%d,%d,%d", &class, &xs, &ys) == 3)
+    {
+        // �ڐG�^NPC
+        int  i, j;
+
+        if (xs >= 0)
+            xs = xs * 2 + 1;
+        if (ys >= 0)
+            ys = ys * 2 + 1;
+
+        if (class >= 0)
+        {
+
+            for (i = 0; i < ys; i++)
+            {
+                for (j = 0; j < xs; j++)
+                {
+                    int  t;
+                    t = map_getcell (m, x - xs / 2 + j, y - ys / 2 + i);
+                    if (t == 1 || t == 5)
+                        continue;
+                    map_setcell (m, x - xs / 2 + j, y - ys / 2 + i, t | 0x80);
+                }
+            }
+        }
 
-	}else{
-		// duplicate
+        nd->u.scr.xs = xs;
+        nd->u.scr.ys = ys;
+    }
+    else
+    {                           // �N���b�N�^NPC
+        class = atoi (w4);
+        nd->u.scr.xs = 0;
+        nd->u.scr.ys = 0;
+    }
 
-//		nd->u.scr.label_list=malloc(sizeof(struct npc_label_list)*label_dupnum);
-//		memcpy(nd->u.scr.label_list,label_dup,sizeof(struct npc_label_list)*label_dupnum);
+    if (class < 0 && m >= 0)
+    {                           // �C�x���g�^NPC
+        evflag = 1;
+    }
 
-		nd->u.scr.label_list=label_dup;	// ���x���f�[�^���L
-		nd->u.scr.label_list_num=label_dupnum;
-	}
+    while ((p = strchr (w3, ':')))
+    {
+        if (p[1] == ':')
+            break;
+    }
+    if (p)
+    {
+        *p = 0;
+        memcpy (nd->name, w3, 24);
+        memcpy (nd->exname, p + 2, 24);
+    }
+    else
+    {
+        memcpy (nd->name, w3, 24);
+        memcpy (nd->exname, w3, 24);
+    }
 
-	//-----------------------------------------
-	// �C�x���g�p���x���f�[�^�̃G�N�X�|�[�g
-	for(i=0;i<nd->u.scr.label_list_num;i++){
-		char *lname=nd->u.scr.label_list[i].name;
-		int pos=nd->u.scr.label_list[i].pos;
-	
-		if ((lname[0]=='O' || lname[0]=='o')&&(lname[1]=='N' || lname[1]=='n')) {
-			struct event_data *ev;
-			char *buf;
-			// �G�N�X�|�[�g������
-			ev=(struct event_data *)aCalloc(1,sizeof(struct event_data));
-			buf=(char *)aCalloc(50,sizeof(char));
-			if (strlen(lname)>24) {
-				printf("npc_parse_script: label name error !\n");
-				exit(1);
-			}else{
-				ev->nd=nd;
-				ev->pos=pos;
-				sprintf(buf,"%s::%s",nd->exname,lname);
-				strdb_insert(ev_db,buf,ev);
-			}
-		}
-	}
-	
-	//-----------------------------------------
-	// ���x���f�[�^�����^�C�}�[�C�x���g���荞��
-	for(i=0;i<nd->u.scr.label_list_num;i++){
-		int t=0,k=0;
-		char *lname=nd->u.scr.label_list[i].name;
-		int pos=nd->u.scr.label_list[i].pos;
-		if(sscanf(lname,"OnTimer%d%n",&t,&k)==1 && lname[k]=='\0') {
-			// �^�C�}�[�C�x���g
-			struct npc_timerevent_list *te=nd->u.scr.timer_event;
-			int j,k=nd->u.scr.timeramount;
-			if(te==NULL)
-				te=(struct npc_timerevent_list *)aCalloc(1,sizeof(struct npc_timerevent_list));
-			else
-				te=(struct npc_timerevent_list *)aRealloc( te, sizeof(struct npc_timerevent_list) * (k+1) );
-			for(j=0;j<k;j++){
-				if(te[j].timer>t){
-					memmove(te+j+1,te+j,sizeof(struct npc_timerevent_list)*(k-j));
-					break;
-				}
-			}
-			te[j].timer=t;
-			te[j].pos=pos;
-			nd->u.scr.timer_event=te;
-			nd->u.scr.timeramount=k+1;
-		}
-	}
-	nd->u.scr.nexttimer=-1;
-	nd->u.scr.timerid=-1;
+    nd->bl.prev = nd->bl.next = NULL;
+    nd->bl.m = m;
+    nd->bl.x = x;
+    nd->bl.y = y;
+    nd->bl.id = npc_get_new_npc_id ();
+    nd->dir = dir;
+    nd->flag = 0;
+    nd->class = class;
+    nd->speed = 200;
+    nd->u.scr.script = script;
+    nd->u.scr.src_id = src_id;
+    nd->chat_id = 0;
+    nd->option = 0;
+    nd->opt1 = 0;
+    nd->opt2 = 0;
+    nd->opt3 = 0;
+
+    //printf("script npc %s %d %d read done\n",mapname,nd->bl.id,nd->class);
+    npc_script++;
+    nd->bl.type = BL_NPC;
+    nd->bl.subtype = SCRIPT;
+    if (m >= 0)
+    {
+        nd->n = map_addnpc (m, nd);
+        map_addblock (&nd->bl);
+
+        if (evflag)
+        {                       // �C�x���g�^
+            struct event_data *ev =
+                (struct event_data *) aCalloc (1, sizeof (struct event_data));
+            ev->nd = nd;
+            ev->pos = 0;
+            strdb_insert (ev_db, nd->exname, ev);
+        }
+        else
+            clif_spawnnpc (nd);
+    }
+    strdb_insert (npcname_db, nd->exname, nd);
 
-	return 0;
+    //-----------------------------------------
+    // ���x���f�[�^�̏���   
+    if (srcbuf)
+    {
+        // script�{�̂������ꍇ�̏���
+
+        // ���x���f�[�^�̃R���o�[�g
+        label_db = script_get_label_db ();
+        strdb_foreach (label_db, npc_convertlabel_db, nd);
+
+        // ���g���Ȃ��̂Ńo�b�t�@����
+        free (srcbuf);
+
+    }
+    else
+    {
+        // duplicate
+
+//      nd->u.scr.label_list=malloc(sizeof(struct npc_label_list)*label_dupnum);
+//      memcpy(nd->u.scr.label_list,label_dup,sizeof(struct npc_label_list)*label_dupnum);
+
+        nd->u.scr.label_list = label_dup;   // ���x���f�[�^���L
+        nd->u.scr.label_list_num = label_dupnum;
+    }
+
+    //-----------------------------------------
+    // �C�x���g�p���x���f�[�^�̃G�N�X�|�[�g
+    for (i = 0; i < nd->u.scr.label_list_num; i++)
+    {
+        char *lname = nd->u.scr.label_list[i].name;
+        int  pos = nd->u.scr.label_list[i].pos;
+
+        if ((lname[0] == 'O' || lname[0] == 'o')
+            && (lname[1] == 'N' || lname[1] == 'n'))
+        {
+            struct event_data *ev;
+            char *buf;
+            // �G�N�X�|�[�g������
+            ev = (struct event_data *) aCalloc (1,
+                                                sizeof (struct event_data));
+            buf = (char *) aCalloc (50, sizeof (char));
+            if (strlen (lname) > 24)
+            {
+                printf ("npc_parse_script: label name error !\n");
+                exit (1);
+            }
+            else
+            {
+                ev->nd = nd;
+                ev->pos = pos;
+                sprintf (buf, "%s::%s", nd->exname, lname);
+                strdb_insert (ev_db, buf, ev);
+            }
+        }
+    }
+
+    //-----------------------------------------
+    // ���x���f�[�^�����^�C�}�[�C�x���g���荞��
+    for (i = 0; i < nd->u.scr.label_list_num; i++)
+    {
+        int  t = 0, k = 0;
+        char *lname = nd->u.scr.label_list[i].name;
+        int  pos = nd->u.scr.label_list[i].pos;
+        if (sscanf (lname, "OnTimer%d%n", &t, &k) == 1 && lname[k] == '\0')
+        {
+            // �^�C�}�[�C�x���g
+            struct npc_timerevent_list *te = nd->u.scr.timer_event;
+            int  j, k = nd->u.scr.timeramount;
+            if (te == NULL)
+                te = (struct npc_timerevent_list *) aCalloc (1,
+                                                             sizeof (struct
+                                                                     npc_timerevent_list));
+            else
+                te = (struct npc_timerevent_list *) aRealloc (te,
+                                                              sizeof (struct
+                                                                      npc_timerevent_list)
+                                                              * (k + 1));
+            for (j = 0; j < k; j++)
+            {
+                if (te[j].timer > t)
+                {
+                    memmove (te + j + 1, te + j,
+                             sizeof (struct npc_timerevent_list) * (k - j));
+                    break;
+                }
+            }
+            te[j].timer = t;
+            te[j].pos = pos;
+            nd->u.scr.timer_event = te;
+            nd->u.scr.timeramount = k + 1;
+        }
+    }
+    nd->u.scr.nexttimer = -1;
+    nd->u.scr.timerid = -1;
+
+    return 0;
 }
 
 /*==========================================
  * function�s����
  *------------------------------------------
  */
-static int npc_parse_function(char *w1,char *w2,char *w3,char *w4,char *first_line,FILE *fp,int *lines)
+static int npc_parse_function (char *w1, char *w2, char *w3, char *w4,
+                               char *first_line, FILE * fp, int *lines)
 {
-	char *srcbuf=NULL,*script;
-	int srcsize=65536;
-	int startline=0;
-	char line[1024];
-	int i;
-//	struct dbt *label_db;
-	char *p;
-
-	// �X�N���v�g�̉���
-	srcbuf=(char *)aCalloc(srcsize,sizeof(char));
-	if (strchr(first_line,'{')) {
-		strcpy(srcbuf,strchr(first_line,'{'));
-		startline=*lines;
-	} else
-		srcbuf[0]=0;
-	while(1) {
-		for(i=strlen(srcbuf)-1;i>=0 && isspace(srcbuf[i]);i--);
-		if (i>=0 && srcbuf[i]=='}')
-			break;
-		fgets(line,1020,fp);
-		(*lines)++;
-		if (feof(fp))
-			break;
-		if (strlen(srcbuf)+strlen(line)+1>=srcsize) {
-			srcsize += 65536;
-			srcbuf = (char *)aRealloc(srcbuf, srcsize);
-			memset(srcbuf + srcsize - 65536, '\0', 65536);
-		}
-		if (srcbuf[0]!='{') {
-			if (strchr(line,'{')) {
-				strcpy(srcbuf,strchr(line,'{'));
-				startline=*lines;
-			}
-		} else
-			strcat(srcbuf,line);
-	}
-	script=parse_script(srcbuf,startline);
-	if (script==NULL) {
-		// script parse error?
-		free(srcbuf);
-		return 1;
-	}
+    char *srcbuf = NULL, *script;
+    int  srcsize = 65536;
+    int  startline = 0;
+    char line[1024];
+    int  i;
+//  struct dbt *label_db;
+    char *p;
+
+    // �X�N���v�g�̉���
+    srcbuf = (char *) aCalloc (srcsize, sizeof (char));
+    if (strchr (first_line, '{'))
+    {
+        strcpy (srcbuf, strchr (first_line, '{'));
+        startline = *lines;
+    }
+    else
+        srcbuf[0] = 0;
+    while (1)
+    {
+        for (i = strlen (srcbuf) - 1; i >= 0 && isspace (srcbuf[i]); i--);
+        if (i >= 0 && srcbuf[i] == '}')
+            break;
+        fgets (line, 1020, fp);
+        (*lines)++;
+        if (feof (fp))
+            break;
+        if (strlen (srcbuf) + strlen (line) + 1 >= srcsize)
+        {
+            srcsize += 65536;
+            srcbuf = (char *) aRealloc (srcbuf, srcsize);
+            memset (srcbuf + srcsize - 65536, '\0', 65536);
+        }
+        if (srcbuf[0] != '{')
+        {
+            if (strchr (line, '{'))
+            {
+                strcpy (srcbuf, strchr (line, '{'));
+                startline = *lines;
+            }
+        }
+        else
+            strcat (srcbuf, line);
+    }
+    script = parse_script (srcbuf, startline);
+    if (script == NULL)
+    {
+        // script parse error?
+        free (srcbuf);
+        return 1;
+    }
 
-	p=(char *)aCalloc(50,sizeof(char));
+    p = (char *) aCalloc (50, sizeof (char));
 
-	strncpy(p,w3,50);
-	strdb_insert(script_get_userfunc_db(),p,script);
+    strncpy (p, w3, 50);
+    strdb_insert (script_get_userfunc_db (), p, script);
 
-//	label_db=script_get_label_db();
+//  label_db=script_get_label_db();
 
-	// ���g���Ȃ��̂Ńo�b�t�@����
-	free(srcbuf);
-	
-//	printf("function %s => %p\n",p,script);
-	
-	return 0;
-}
+    // ���g���Ȃ��̂Ńo�b�t�@����
+    free (srcbuf);
+
+//  printf("function %s => %p\n",p,script);
 
+    return 0;
+}
 
 /*==========================================
  * mob�s����
  *------------------------------------------
  */
-int npc_parse_mob(char *w1,char *w2,char *w3,char *w4)
+int npc_parse_mob (char *w1, char *w2, char *w3, char *w4)
 {
-	int m,x,y,xs,ys,class,num,delay1,delay2;
-	int i;
-	char mapname[24];
-	char eventname[24]="";
-	struct mob_data *md;
-
-	xs=ys=0;
-	delay1=delay2=0;
-	// �����̌��`�F�b�N
-	if (sscanf(w1,"%[^,],%d,%d,%d,%d",mapname,&x,&y,&xs,&ys) < 3 ||
-	   sscanf(w4,"%d,%d,%d,%d,%s",&class,&num,&delay1,&delay2,eventname) < 2 ) {
-		printf("bad monster line : %s\n",w3);
-		return 1;
-	}
+    int  m, x, y, xs, ys, class, num, delay1, delay2;
+    int  i;
+    char mapname[24];
+    char eventname[24] = "";
+    struct mob_data *md;
+
+    xs = ys = 0;
+    delay1 = delay2 = 0;
+    // �����̌��`�F�b�N
+    if (sscanf (w1, "%[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 ||
+        sscanf (w4, "%d,%d,%d,%d,%s", &class, &num, &delay1, &delay2,
+                eventname) < 2)
+    {
+        printf ("bad monster line : %s\n", w3);
+        return 1;
+    }
 
-	m=map_mapname2mapid(mapname);
+    m = map_mapname2mapid (mapname);
 
-	if ( num>1 && battle_config.mob_count_rate!=100) {
-		if ( (num=num*battle_config.mob_count_rate/100)<1 )
-			num=1;
-	}
+    if (num > 1 && battle_config.mob_count_rate != 100)
+    {
+        if ((num = num * battle_config.mob_count_rate / 100) < 1)
+            num = 1;
+    }
 
-	for(i=0;i<num;i++) {
-		md=(struct mob_data *)aCalloc(1,sizeof(struct mob_data));
-
-		md->bl.prev=NULL;
-		md->bl.next=NULL;
-		md->bl.m=m;
-		md->bl.x=x;
-		md->bl.y=y;
-		if(strcmp(w3,"--en--")==0)
-			memcpy(md->name,mob_db[class].name,24);
-		else if(strcmp(w3,"--ja--")==0)
-			memcpy(md->name,mob_db[class].jname,24);
-		else
-		memcpy(md->name,w3,24);
-
-		md->n = i;
-		md->base_class = md->class = class;
-		md->bl.id=npc_get_new_npc_id();
-		md->m =m;
-		md->x0=x;
-		md->y0=y;
-		md->xs=xs;
-		md->ys=ys;
-		md->spawndelay1=delay1;
-		md->spawndelay2=delay2;
-
-		memset(&md->state,0,sizeof(md->state));
-		md->timer = -1;
-		md->target_id=0;
-		md->attacked_id=0;
-
-		if (mob_db[class].mode&0x02)
-			md->lootitem=(struct item *)aCalloc(LOOTITEM_SIZE,sizeof(struct item));
-		else
-			md->lootitem=NULL;
-
-		if (strlen(eventname)>=4) {
-			memcpy(md->npc_event,eventname,24);
-		}else
-			memset(md->npc_event,0,24);
-
-		md->bl.type=BL_MOB;
-		map_addiddb(&md->bl);
-		mob_spawn(md->bl.id);
-
-		npc_mob++;
-	}
-	//printf("warp npc %s %d read done\n",mapname,nd->bl.id);
+    for (i = 0; i < num; i++)
+    {
+        md = (struct mob_data *) aCalloc (1, sizeof (struct mob_data));
+
+        md->bl.prev = NULL;
+        md->bl.next = NULL;
+        md->bl.m = m;
+        md->bl.x = x;
+        md->bl.y = y;
+        if (strcmp (w3, "--en--") == 0)
+            memcpy (md->name, mob_db[class].name, 24);
+        else if (strcmp (w3, "--ja--") == 0)
+            memcpy (md->name, mob_db[class].jname, 24);
+        else
+            memcpy (md->name, w3, 24);
+
+        md->n = i;
+        md->base_class = md->class = class;
+        md->bl.id = npc_get_new_npc_id ();
+        md->m = m;
+        md->x0 = x;
+        md->y0 = y;
+        md->xs = xs;
+        md->ys = ys;
+        md->spawndelay1 = delay1;
+        md->spawndelay2 = delay2;
+
+        memset (&md->state, 0, sizeof (md->state));
+        md->timer = -1;
+        md->target_id = 0;
+        md->attacked_id = 0;
+
+        if (mob_db[class].mode & 0x02)
+            md->lootitem =
+                (struct item *) aCalloc (LOOTITEM_SIZE, sizeof (struct item));
+        else
+            md->lootitem = NULL;
+
+        if (strlen (eventname) >= 4)
+        {
+            memcpy (md->npc_event, eventname, 24);
+        }
+        else
+            memset (md->npc_event, 0, 24);
 
-	return 0;
+        md->bl.type = BL_MOB;
+        map_addiddb (&md->bl);
+        mob_spawn (md->bl.id);
+
+        npc_mob++;
+    }
+    //printf("warp npc %s %d read done\n",mapname,nd->bl.id);
+
+    return 0;
 }
 
 /*==========================================
  * �}�b�v�t���O�s�̉���
  *------------------------------------------
  */
-static int npc_parse_mapflag(char *w1,char *w2,char *w3,char *w4)
+static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4)
 {
-	int m;
-	char mapname[24],savemap[16];
-	int savex,savey;
-	char drop_arg1[16],drop_arg2[16];
-	int drop_id=0,drop_type=0,drop_per=0;
-
-	// �����̌��`�F�b�N
-//	if (	sscanf(w1,"%[^,],%d,%d,%d",mapname,&x,&y,&dir) != 4 )
-	if (	sscanf(w1,"%[^,]",mapname) != 1 )
-		return 1;
+    int  m;
+    char mapname[24], savemap[16];
+    int  savex, savey;
+    char drop_arg1[16], drop_arg2[16];
+    int  drop_id = 0, drop_type = 0, drop_per = 0;
+
+    // �����̌��`�F�b�N
+//  if (    sscanf(w1,"%[^,],%d,%d,%d",mapname,&x,&y,&dir) != 4 )
+    if (sscanf (w1, "%[^,]", mapname) != 1)
+        return 1;
 
-	m=map_mapname2mapid(mapname);
-	if (m<0)
-		return 1;
+    m = map_mapname2mapid (mapname);
+    if (m < 0)
+        return 1;
 
 //�}�b�v�t���O
-	if ( strcmpi(w3,"nosave")==0) {
-		if (strcmp(w4,"SavePoint")==0) {
-			memcpy(map[m].save.map,"SavePoint",16);
-			map[m].save.x=-1;
-			map[m].save.y=-1;
-		}else if (sscanf(w4,"%[^,],%d,%d",savemap,&savex,&savey)==3) {
-			memcpy(map[m].save.map,savemap,16);
-			map[m].save.x=savex;
-			map[m].save.y=savey;
-		}
-		map[m].flag.nosave=1;
-	}
-	else if (strcmpi(w3,"nomemo")==0) {
-		map[m].flag.nomemo=1;
-	}
-	else if (strcmpi(w3,"noteleport")==0) {
-		map[m].flag.noteleport=1;
-	}
-	else if (strcmpi(w3,"nowarp")==0) {
-		map[m].flag.nowarp=1;
-	}
-	else if (strcmpi(w3,"nowarpto")==0) {
-		map[m].flag.nowarpto=1;
-	}
-	else if (strcmpi(w3,"noreturn")==0) {
-		map[m].flag.noreturn=1;
-	}
-	else if (strcmpi(w3,"monster_noteleport")==0) {
-		map[m].flag.monster_noteleport=1;
-	}
-	else if (strcmpi(w3,"nobranch")==0) {
-		map[m].flag.nobranch=1;
-	}
-	else if (strcmpi(w3,"nopenalty")==0) {
-		map[m].flag.nopenalty=1;
-	}
-	else if (strcmpi(w3,"pvp")==0) {
-		map[m].flag.pvp=1;
-	}
-	else if (strcmpi(w3,"pvp_noparty")==0) {
-		map[m].flag.pvp_noparty=1;
-	}
-	else if (strcmpi(w3,"pvp_noguild")==0) {
-		map[m].flag.pvp_noguild=1;
-	}
-	else if (strcmpi(w3,"pvp_nightmaredrop")==0) {
-		if (sscanf(w4,"%[^,],%[^,],%d",drop_arg1,drop_arg2,&drop_per)==3) {		int i;
-			if(strcmp(drop_arg1,"random")==0)
-				drop_id = -1;
-			else if(itemdb_exists( (drop_id=atoi(drop_arg1)) )==NULL)
-				drop_id = 0;
-			if(strcmp(drop_arg2,"inventory")==0)
-				drop_type = 1;
-			else if(strcmp(drop_arg2,"equip")==0)
-				drop_type = 2;
-			else if(strcmp(drop_arg2,"all")==0)
-				drop_type = 3;
-
-			if(drop_id != 0){
-				for (i=0;i<MAX_DROP_PER_MAP;i++){
-					if(map[m].drop_list[i].drop_id==0){
-						map[m].drop_list[i].drop_id = drop_id;
-						map[m].drop_list[i].drop_type = drop_type;
-						map[m].drop_list[i].drop_per = drop_per;
-						break;
-					}
-				}
-				map[m].flag.pvp_nightmaredrop=1;
-			}
-		}
-	}
-	else if (strcmpi(w3,"pvp_nocalcrank")==0) {
-		map[m].flag.pvp_nocalcrank=1;
-	}
-	else if (strcmpi(w3,"gvg")==0) {
-		map[m].flag.gvg=1;
-	}
-	else if (strcmpi(w3,"gvg_noparty")==0) {
-		map[m].flag.gvg_noparty=1;
-	}
-	else if (strcmpi(w3,"nozenypenalty")==0) {
-		map[m].flag.nozenypenalty=1;
-	}
-	else if (strcmpi(w3,"notrade")==0) {
-		map[m].flag.notrade=1;
-	}
-	else if (strcmpi(w3,"noskill")==0) {
-		map[m].flag.noskill=1;
-	}
-	else if (battle_config.pk_mode && strcmpi(w3,"nopvp")==0) { // nopvp for pk mode [Valaris]
-		map[m].flag.nopvp=1;
-		map[m].flag.pvp=0;
-	}
-	else if (strcmpi(w3,"noicewall")==0) { // noicewall [Valaris]
-		map[m].flag.noicewall=1;
-	}
-	else if (strcmpi(w3,"snow")==0) { // snow [Valaris]
-		map[m].flag.snow=1;
-	}
-	else if (strcmpi(w3,"fog")==0) { // fog [Valaris]
-		map[m].flag.fog=1;
-	}
-	else if (strcmpi(w3,"sakura")==0) { // sakura [Valaris]
-		map[m].flag.sakura=1;
-	}
-	else if (strcmpi(w3,"leaves")==0) { // leaves [Valaris]
-		map[m].flag.leaves=1;
-	}
-	else if (strcmpi(w3,"rain")==0) { // rain [Valaris]
-		map[m].flag.rain=1;
-	}
-	else if (strcmpi(w3,"no_player_drops")==0) { // rain [Valaris]
-		map[m].flag.no_player_drops=1;
-	}
-	
-	return 0;
+    if (strcmpi (w3, "nosave") == 0)
+    {
+        if (strcmp (w4, "SavePoint") == 0)
+        {
+            memcpy (map[m].save.map, "SavePoint", 16);
+            map[m].save.x = -1;
+            map[m].save.y = -1;
+        }
+        else if (sscanf (w4, "%[^,],%d,%d", savemap, &savex, &savey) == 3)
+        {
+            memcpy (map[m].save.map, savemap, 16);
+            map[m].save.x = savex;
+            map[m].save.y = savey;
+        }
+        map[m].flag.nosave = 1;
+    }
+    else if (strcmpi (w3, "nomemo") == 0)
+    {
+        map[m].flag.nomemo = 1;
+    }
+    else if (strcmpi (w3, "noteleport") == 0)
+    {
+        map[m].flag.noteleport = 1;
+    }
+    else if (strcmpi (w3, "nowarp") == 0)
+    {
+        map[m].flag.nowarp = 1;
+    }
+    else if (strcmpi (w3, "nowarpto") == 0)
+    {
+        map[m].flag.nowarpto = 1;
+    }
+    else if (strcmpi (w3, "noreturn") == 0)
+    {
+        map[m].flag.noreturn = 1;
+    }
+    else if (strcmpi (w3, "monster_noteleport") == 0)
+    {
+        map[m].flag.monster_noteleport = 1;
+    }
+    else if (strcmpi (w3, "nobranch") == 0)
+    {
+        map[m].flag.nobranch = 1;
+    }
+    else if (strcmpi (w3, "nopenalty") == 0)
+    {
+        map[m].flag.nopenalty = 1;
+    }
+    else if (strcmpi (w3, "pvp") == 0)
+    {
+        map[m].flag.pvp = 1;
+    }
+    else if (strcmpi (w3, "pvp_noparty") == 0)
+    {
+        map[m].flag.pvp_noparty = 1;
+    }
+    else if (strcmpi (w3, "pvp_noguild") == 0)
+    {
+        map[m].flag.pvp_noguild = 1;
+    }
+    else if (strcmpi (w3, "pvp_nightmaredrop") == 0)
+    {
+        if (sscanf (w4, "%[^,],%[^,],%d", drop_arg1, drop_arg2, &drop_per) ==
+            3)
+        {
+            int  i;
+            if (strcmp (drop_arg1, "random") == 0)
+                drop_id = -1;
+            else if (itemdb_exists ((drop_id = atoi (drop_arg1))) == NULL)
+                drop_id = 0;
+            if (strcmp (drop_arg2, "inventory") == 0)
+                drop_type = 1;
+            else if (strcmp (drop_arg2, "equip") == 0)
+                drop_type = 2;
+            else if (strcmp (drop_arg2, "all") == 0)
+                drop_type = 3;
+
+            if (drop_id != 0)
+            {
+                for (i = 0; i < MAX_DROP_PER_MAP; i++)
+                {
+                    if (map[m].drop_list[i].drop_id == 0)
+                    {
+                        map[m].drop_list[i].drop_id = drop_id;
+                        map[m].drop_list[i].drop_type = drop_type;
+                        map[m].drop_list[i].drop_per = drop_per;
+                        break;
+                    }
+                }
+                map[m].flag.pvp_nightmaredrop = 1;
+            }
+        }
+    }
+    else if (strcmpi (w3, "pvp_nocalcrank") == 0)
+    {
+        map[m].flag.pvp_nocalcrank = 1;
+    }
+    else if (strcmpi (w3, "gvg") == 0)
+    {
+        map[m].flag.gvg = 1;
+    }
+    else if (strcmpi (w3, "gvg_noparty") == 0)
+    {
+        map[m].flag.gvg_noparty = 1;
+    }
+    else if (strcmpi (w3, "nozenypenalty") == 0)
+    {
+        map[m].flag.nozenypenalty = 1;
+    }
+    else if (strcmpi (w3, "notrade") == 0)
+    {
+        map[m].flag.notrade = 1;
+    }
+    else if (strcmpi (w3, "noskill") == 0)
+    {
+        map[m].flag.noskill = 1;
+    }
+    else if (battle_config.pk_mode && strcmpi (w3, "nopvp") == 0)
+    {                           // nopvp for pk mode [Valaris]
+        map[m].flag.nopvp = 1;
+        map[m].flag.pvp = 0;
+    }
+    else if (strcmpi (w3, "noicewall") == 0)
+    {                           // noicewall [Valaris]
+        map[m].flag.noicewall = 1;
+    }
+    else if (strcmpi (w3, "snow") == 0)
+    {                           // snow [Valaris]
+        map[m].flag.snow = 1;
+    }
+    else if (strcmpi (w3, "fog") == 0)
+    {                           // fog [Valaris]
+        map[m].flag.fog = 1;
+    }
+    else if (strcmpi (w3, "sakura") == 0)
+    {                           // sakura [Valaris]
+        map[m].flag.sakura = 1;
+    }
+    else if (strcmpi (w3, "leaves") == 0)
+    {                           // leaves [Valaris]
+        map[m].flag.leaves = 1;
+    }
+    else if (strcmpi (w3, "rain") == 0)
+    {                           // rain [Valaris]
+        map[m].flag.rain = 1;
+    }
+    else if (strcmpi (w3, "no_player_drops") == 0)
+    {                           // rain [Valaris]
+        map[m].flag.no_player_drops = 1;
+    }
+
+    return 0;
 }
 
-static int ev_db_final(void *key,void *data,va_list ap)
+static int ev_db_final (void *key, void *data, va_list ap)
 {
-	free(data);
-	if(strstr(key,"::")!=NULL)
-		free(key);
-	return 0;
+    free (data);
+    if (strstr (key, "::") != NULL)
+        free (key);
+    return 0;
 }
-static int npcname_db_final(void *key,void *data,va_list ap)
+
+static int npcname_db_final (void *key, void *data, va_list ap)
 {
-	return 0;
+    return 0;
 }
 
-struct npc_data *
-npc_spawn_text(int m, int x, int y,
-               int class,
-               char *name,
-               char *message)
+struct npc_data *npc_spawn_text (int m, int x, int y,
+                                 int class, char *name, char *message)
 {
-    struct npc_data *retval = (struct npc_data *)aCalloc(1, sizeof(struct npc_data));
-    retval->bl.id = npc_get_new_npc_id();
+    struct npc_data *retval =
+        (struct npc_data *) aCalloc (1, sizeof (struct npc_data));
+    retval->bl.id = npc_get_new_npc_id ();
     retval->bl.x = x;
     retval->bl.y = y;
     retval->bl.m = m;
     retval->bl.type = BL_NPC;
     retval->bl.subtype = MESSAGE;
 
-    strncpy(retval->name, name, 23);
-    strncpy(retval->exname, name, 23);
+    strncpy (retval->name, name, 23);
+    strncpy (retval->exname, name, 23);
     retval->name[15] = 0;
     retval->exname[15] = 0;
-    retval->u.message = message? strdup(message) : NULL;
+    retval->u.message = message ? strdup (message) : NULL;
 
     retval->class = class;
     retval->speed = 200;
 
-    clif_spawnnpc(retval);
-    map_addblock(&retval->bl);
-    map_addiddb(&retval->bl);
+    clif_spawnnpc (retval);
+    map_addblock (&retval->bl);
+    map_addiddb (&retval->bl);
     if (retval->name && retval->name[0])
-        strdb_insert(npcname_db, retval->name, retval);
+        strdb_insert (npcname_db, retval->name, retval);
 
     return retval;
 }
 
-static void
-npc_free_internal(struct npc_data *nd)
+static void npc_free_internal (struct npc_data *nd)
 {
     struct chat_data *cd;
 
-    if(nd->chat_id && (cd=(struct chat_data*)map_id2bl(nd->chat_id))) {
-        free(cd);
+    if (nd->chat_id && (cd = (struct chat_data *) map_id2bl (nd->chat_id)))
+    {
+        free (cd);
         cd = NULL;
     }
-    if(nd->bl.subtype == SCRIPT) {
-        if(nd->u.scr.timer_event)
-            free(nd->u.scr.timer_event);
-        if(nd->u.scr.src_id==0){
-            if(nd->u.scr.script){
-                free(nd->u.scr.script);
-                nd->u.scr.script=NULL;
+    if (nd->bl.subtype == SCRIPT)
+    {
+        if (nd->u.scr.timer_event)
+            free (nd->u.scr.timer_event);
+        if (nd->u.scr.src_id == 0)
+        {
+            if (nd->u.scr.script)
+            {
+                free (nd->u.scr.script);
+                nd->u.scr.script = NULL;
             }
-            if(nd->u.scr.label_list){
-                free(nd->u.scr.label_list);
+            if (nd->u.scr.label_list)
+            {
+                free (nd->u.scr.label_list);
                 nd->u.scr.label_list = NULL;
             }
         }
-    } else if (nd->bl.subtype == MESSAGE
-               && nd->u.message) {
-        free(nd->u.message);
     }
-    free(nd);
+    else if (nd->bl.subtype == MESSAGE && nd->u.message)
+    {
+        free (nd->u.message);
+    }
+    free (nd);
 }
 
-void
-npc_propagate_update(struct npc_data *nd)
+void npc_propagate_update (struct npc_data *nd)
 {
-    map_foreachinarea(npc_enable_sub,
-                      nd->bl.m,
-                      nd->bl.x - nd->u.scr.xs, nd->bl.y - nd->u.scr.ys,
-                      nd->bl.x + nd->u.scr.xs, nd->bl.y + nd->u.scr.ys,
-                      BL_PC, nd);
+    map_foreachinarea (npc_enable_sub,
+                       nd->bl.m,
+                       nd->bl.x - nd->u.scr.xs, nd->bl.y - nd->u.scr.ys,
+                       nd->bl.x + nd->u.scr.xs, nd->bl.y + nd->u.scr.ys,
+                       BL_PC, nd);
 }
 
-void
-npc_free(struct npc_data *nd)
+void npc_free (struct npc_data *nd)
 {
-    clif_clearchar(&nd->bl, 0);
-    npc_propagate_update(nd);
-    map_deliddb(&nd->bl);
-    map_delblock(&nd->bl);
-    npc_free_internal(nd);
+    clif_clearchar (&nd->bl, 0);
+    npc_propagate_update (nd);
+    map_deliddb (&nd->bl);
+    map_delblock (&nd->bl);
+    npc_free_internal (nd);
 }
 
 /*==========================================
  * �I��
  *------------------------------------------
  */
-int do_final_npc(void)
+int do_final_npc (void)
 {
-	int i;
-	struct block_list *bl;
-	struct npc_data *nd;
-	struct mob_data *md;
-
-	if(ev_db)
-		strdb_final(ev_db,ev_db_final);
-	if(npcname_db)
-		strdb_final(npcname_db,npcname_db_final);
-
-	for(i=START_NPC_NUM;i<npc_id;i++){
-		if((bl=map_id2bl(i))){
-			if(bl->type == BL_NPC && (nd = (struct npc_data *)bl))
-                            npc_free_internal(nd);
-                        else if(bl->type == BL_MOB && (md = (struct mob_data *)bl)){
-				if(md->lootitem){
-					free(md->lootitem);
-					md->lootitem = NULL;
-				}
-				free(md);
-				md = NULL;
-			}
-		}
-	}
-	
-	return 0;
-}
+    int  i;
+    struct block_list *bl;
+    struct npc_data *nd;
+    struct mob_data *md;
+
+    if (ev_db)
+        strdb_final (ev_db, ev_db_final);
+    if (npcname_db)
+        strdb_final (npcname_db, npcname_db_final);
+
+    for (i = START_NPC_NUM; i < npc_id; i++)
+    {
+        if ((bl = map_id2bl (i)))
+        {
+            if (bl->type == BL_NPC && (nd = (struct npc_data *) bl))
+                npc_free_internal (nd);
+            else if (bl->type == BL_MOB && (md = (struct mob_data *) bl))
+            {
+                if (md->lootitem)
+                {
+                    free (md->lootitem);
+                    md->lootitem = NULL;
+                }
+                free (md);
+                md = NULL;
+            }
+        }
+    }
 
+    return 0;
+}
 
-void ev_release(struct dbn *db, int which) 
+void ev_release (struct dbn *db, int which)
 {
     if (which & 0x1)
-        free(db->key);
+        free (db->key);
     if (which & 0x2)
-        free(db->data);
+        free (db->data);
 }
 
 /*==========================================
  * npc������
  *------------------------------------------
  */
-int do_init_npc(void)
+int do_init_npc (void)
 {
-	struct npc_src_list *nsl;
-	FILE *fp;
-	char line[1024];
-	int m,lines;
-
-	ev_db=strdb_init(24);
-	npcname_db=strdb_init(24);
-
-        ev_db->release = ev_release;
-	
-	memset(&ev_tm_b,-1,sizeof(ev_tm_b));
-
-	for(nsl=npc_src_first;nsl;nsl=nsl->next) {
-		if(nsl->prev){
-			free(nsl->prev);
-			nsl->prev = NULL;
-		}
-		fp=fopen_(nsl->name,"r");
-		if (fp==NULL) {
-			printf("file not found : %s\n",nsl->name);
-			exit(1);
-		}
-		lines=0;
-		while(fgets(line,1020,fp)) {
-			char w1[1024],w2[1024],w3[1024],w4[1024],mapname[1024];
-			int i,j,w4pos,count;
-			lines++;
-
-			if (line[0] == '/' && line[1] == '/')
-				continue;
-			// �s�v�ȃX�y�[�X���^�u�̘A���͋l�߂�
-			for(i=j=0;line[i];i++) {
-				if (line[i]==' ') {
-					if (!((line[i+1] && (isspace(line[i+1]) || line[i+1]==',')) ||
-						 (j && line[j-1]==',')))
-						line[j++]=' ';
-				} else if (line[i]=='\t') {
-					if (!(j && line[j-1]=='\t'))
-						line[j++]='\t';
-				} else
- 					line[j++]=line[i];
-			}
-			// �ŏ��̓^�u���؂��Ń`�F�b�N���Ă݂āA�_���Ȃ��X�y�[�X���؂��Ŋm�F
-			if ((count=sscanf(line,"%[^\t]\t%[^\t]\t%[^\t\r\n]\t%n%[^\t\r\n]",w1,w2,w3,&w4pos,w4)) < 3 &&
-			   (count=sscanf(line,"%s%s%s%n%s",w1,w2,w3,&w4pos,w4)) < 3) {
-				continue;
-			}
-			// �}�b�v�̑��݊m�F
-			if( strcmp(w1,"-")!=0 && strcmpi(w1,"function")!=0 ){
-			sscanf(w1,"%[^,]",mapname);
-			m = map_mapname2mapid(mapname);
-			if (strlen(mapname)>16 || m<0) {
-				// "mapname" is not assigned to this server
-				continue;
-			}
-			}
-			if (strcmpi(w2,"warp")==0 && count > 3) {
-				npc_parse_warp(w1,w2,w3,w4);
-			} else if (strcmpi(w2,"shop")==0 && count > 3) {
-				npc_parse_shop(w1,w2,w3,w4);
-			} else if (strcmpi(w2,"script")==0 && count > 3) {
-				if( strcmpi(w1,"function")==0 ){
-					npc_parse_function(w1,w2,w3,w4,line+w4pos,fp,&lines);
-				}else{
-				npc_parse_script(w1,w2,w3,w4,line+w4pos,fp,&lines);
-				}
-			} else if ( (i=0,sscanf(w2,"duplicate%n",&i), (i>0 && w2[i]=='(')) && count > 3) {
-				npc_parse_script(w1,w2,w3,w4,line+w4pos,fp,&lines);
-			} else if (strcmpi(w2,"monster")==0 && count > 3) {
-				npc_parse_mob(w1,w2,w3,w4);
-			} else if (strcmpi(w2,"mapflag")==0 && count >= 3) {
-				npc_parse_mapflag(w1,w2,w3,w4);
-			}
-		}
-		fclose_(fp);
-		printf("\rLoading NPCs [%d]: %-54s",npc_id-START_NPC_NUM,nsl->name);
-		fflush(stdout);
-	}
-	printf("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d]\n",
-		npc_id-START_NPC_NUM,npc_warp,npc_shop,npc_script,npc_mob);
+    struct npc_src_list *nsl;
+    FILE *fp;
+    char line[1024];
+    int  m, lines;
 
-	add_timer_func_list(npc_event_timer,"npc_event_timer");
-	add_timer_func_list(npc_event_do_clock,"npc_event_do_clock");
-	add_timer_func_list(npc_timerevent,"npc_timerevent");
+    ev_db = strdb_init (24);
+    npcname_db = strdb_init (24);
 
-	//exit(1);
+    ev_db->release = ev_release;
 
-	return 0;
+    memset (&ev_tm_b, -1, sizeof (ev_tm_b));
+
+    for (nsl = npc_src_first; nsl; nsl = nsl->next)
+    {
+        if (nsl->prev)
+        {
+            free (nsl->prev);
+            nsl->prev = NULL;
+        }
+        fp = fopen_ (nsl->name, "r");
+        if (fp == NULL)
+        {
+            printf ("file not found : %s\n", nsl->name);
+            exit (1);
+        }
+        lines = 0;
+        while (fgets (line, 1020, fp))
+        {
+            char w1[1024], w2[1024], w3[1024], w4[1024], mapname[1024];
+            int  i, j, w4pos, count;
+            lines++;
+
+            if (line[0] == '/' && line[1] == '/')
+                continue;
+            // �s�v�ȃX�y�[�X���^�u�̘A���͋l�߂�
+            for (i = j = 0; line[i]; i++)
+            {
+                if (line[i] == ' ')
+                {
+                    if (!
+                        ((line[i + 1]
+                          && (isspace (line[i + 1]) || line[i + 1] == ','))
+                         || (j && line[j - 1] == ',')))
+                        line[j++] = ' ';
+                }
+                else if (line[i] == '\t')
+                {
+                    if (!(j && line[j - 1] == '\t'))
+                        line[j++] = '\t';
+                }
+                else
+                    line[j++] = line[i];
+            }
+            // �ŏ��̓^�u���؂��Ń`�F�b�N���Ă݂āA�_���Ȃ��X�y�[�X���؂��Ŋm�F
+            if ((count =
+                 sscanf (line, "%[^\t]\t%[^\t]\t%[^\t\r\n]\t%n%[^\t\r\n]", w1,
+                         w2, w3, &w4pos, w4)) < 3
+                && (count =
+                    sscanf (line, "%s%s%s%n%s", w1, w2, w3, &w4pos, w4)) < 3)
+            {
+                continue;
+            }
+            // �}�b�v�̑��݊m�F
+            if (strcmp (w1, "-") != 0 && strcmpi (w1, "function") != 0)
+            {
+                sscanf (w1, "%[^,]", mapname);
+                m = map_mapname2mapid (mapname);
+                if (strlen (mapname) > 16 || m < 0)
+                {
+                    // "mapname" is not assigned to this server
+                    continue;
+                }
+            }
+            if (strcmpi (w2, "warp") == 0 && count > 3)
+            {
+                npc_parse_warp (w1, w2, w3, w4);
+            }
+            else if (strcmpi (w2, "shop") == 0 && count > 3)
+            {
+                npc_parse_shop (w1, w2, w3, w4);
+            }
+            else if (strcmpi (w2, "script") == 0 && count > 3)
+            {
+                if (strcmpi (w1, "function") == 0)
+                {
+                    npc_parse_function (w1, w2, w3, w4, line + w4pos, fp,
+                                        &lines);
+                }
+                else
+                {
+                    npc_parse_script (w1, w2, w3, w4, line + w4pos, fp,
+                                      &lines);
+                }
+            }
+            else if ((i =
+                      0, sscanf (w2, "duplicate%n", &i), (i > 0
+                                                          && w2[i] == '('))
+                     && count > 3)
+            {
+                npc_parse_script (w1, w2, w3, w4, line + w4pos, fp, &lines);
+            }
+            else if (strcmpi (w2, "monster") == 0 && count > 3)
+            {
+                npc_parse_mob (w1, w2, w3, w4);
+            }
+            else if (strcmpi (w2, "mapflag") == 0 && count >= 3)
+            {
+                npc_parse_mapflag (w1, w2, w3, w4);
+            }
+        }
+        fclose_ (fp);
+        printf ("\rLoading NPCs [%d]: %-54s", npc_id - START_NPC_NUM,
+                nsl->name);
+        fflush (stdout);
+    }
+    printf ("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d]\n",
+            npc_id - START_NPC_NUM, npc_warp, npc_shop, npc_script, npc_mob);
+
+    add_timer_func_list (npc_event_timer, "npc_event_timer");
+    add_timer_func_list (npc_event_do_clock, "npc_event_do_clock");
+    add_timer_func_list (npc_timerevent, "npc_timerevent");
+
+    //exit(1);
+
+    return 0;
 }