Fix getting item shop prices from the DB

author: Jared Adams <jaxad0127@gmail.com> 2009-04-18 20:42:53 -0600
committer: Jared Adams <jaxad0127@gmail.com> 2009-04-18 20:42:53 -0600
commit: b7470529eab877bbc581e821c6673e98dec696b8 (patch)
tree: 309eb728918c720f9fdeb7642532b8db0be7a822 /src/map
parent: 25d9040b9e3b71d6534a7dedbfe34364f2a7ad66 (diff)
download: tmwa-b7470529eab877bbc581e821c6673e98dec696b8.tar.gz
tmwa-b7470529eab877bbc581e821c6673e98dec696b8.tar.bz2
tmwa-b7470529eab877bbc581e821c6673e98dec696b8.tar.xz
tmwa-b7470529eab877bbc581e821c6673e98dec696b8.zip
1 files changed, 83 insertions, 84 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 1d9204d..fa01d56 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -47,13 +47,13 @@ struct event_data {
 	struct npc_data *nd;
 	int pos;
 };
-static struct tm ev_tm_b;	// 帪寁僀儀儞僩梡
+static struct tm ev_tm_b;	// 锟斤拷锟絭锟紺锟絰锟斤拷锟絞锟絧
 
 
 /*==========================================
- * NPC偺柍岠壔/桳岠壔
+ * NPC锟教栵拷锟斤拷锟斤拷/锟絃锟斤拷锟斤拷
  * npc_enable
- * npc_enable_sub 桳岠帪偵OnTouch僀儀儞僩傪幚峴
+ * npc_enable_sub 锟絃锟斤拷锟斤拷锟斤拷OnTouch锟紺锟絰锟斤拷锟絞锟斤拷锟斤拷s
  *------------------------------------------
  */
 int npc_enable_sub( struct block_list *bl, va_list ap )
@@ -67,7 +67,7 @@ int npc_enable_sub( struct block_list *bl, va_list 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)	// 柍岠壔偝傟偰偄傞
+		if (nd->flag&1)	// 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥傦拷锟斤拷
 			return 1;
 
 		memcpy(name,nd->name,50);
@@ -85,7 +85,7 @@ int npc_enable(const char *name,int flag)
 	if (nd==NULL)
 		return 0;
 	
-	if (flag&1) {	// 桳岠壔
+	if (flag&1) {	// 锟絃锟斤拷锟斤拷
 		nd->flag&=~1;
 		clif_spawnnpc(nd);
 	}else if (flag&2){
@@ -96,7 +96,7 @@ int npc_enable(const char *name,int flag)
 		nd->flag|=1;
 		nd->option = 0x0002;
 		clif_changeoption(&nd->bl);
-	}else{		// 柍岠壔
+	}else{		// 锟斤拷锟斤拷锟斤拷
 		nd->flag|=1;
 		clif_clearchar(&nd->bl,0);
 	}
@@ -107,7 +107,7 @@ int npc_enable(const char *name,int flag)
 }
 
 /*==========================================
- * NPC傪柤慜偱扵偡
+ * NPC锟金柤慜锟脚扵锟斤拷
  *------------------------------------------
  */
 struct npc_data* npc_name2id(const char *name)
@@ -115,7 +115,7 @@ struct npc_data* npc_name2id(const char *name)
 	return strdb_search(npcname_db,name);
 }
 /*==========================================
- * 僀儀儞僩僉儏乕偺僀儀儞僩張棟
+ * 锟紺锟絰锟斤拷锟絞锟絃锟斤拷锟絒锟教僀锟絰锟斤拷锟絞锟斤拷锟斤拷
  *------------------------------------------
  */
 int npc_event_dequeue(struct map_session_data *sd)
@@ -123,7 +123,7 @@ int npc_event_dequeue(struct map_session_data *sd)
 	nullpo_retr(0, sd);
 
 	sd->npc_id=0;
-	if (sd->eventqueue[0][0]) {	// 僉儏乕偺僀儀儞僩張棟
+	if (sd->eventqueue[0][0]) {	// 锟絃锟斤拷锟絒锟教僀锟絰锟斤拷锟絞锟斤拷锟斤拷
 		char *name=(char *)aCalloc(50,sizeof(char));
 		int i;
 
@@ -148,7 +148,7 @@ int npc_delete(struct npc_data *nd)
 }
 
 /*==========================================
- * 僀儀儞僩偺抶墑幚峴
+ * 锟紺锟絰锟斤拷锟絞锟教抶锟斤拷锟斤拷s
  *------------------------------------------
  */
 int npc_event_timer(int tid,unsigned int tick,int id,int data)
@@ -222,8 +222,8 @@ int npc_timer(int tid,unsigned int tick,int id,int data)	// Added by RoVeRT
 	return 0;
 }*/
 /*==========================================
- * 僀儀儞僩梡儔儀儖偺僄僋僗億乕僩
- * npc_parse_script->strdb_foreach偐傜屇偽傟傞
+ * 锟紺锟絰锟斤拷锟絞锟絧锟斤拷锟絰锟斤拷锟教僄锟絅锟絏锟絴锟絒锟絞
+ * npc_parse_script->strdb_foreach锟斤拷锟斤拷锟侥偽傦拷锟斤拷
  *------------------------------------------
  */
 int npc_event_export(void *key,void *data,va_list ap)
@@ -236,7 +236,7 @@ int npc_event_export(void *key,void *data,va_list ap)
 		struct event_data *ev;
 		char *buf;
 		char *p=strchr(lname,':');
-		// 僄僋僗億乕僩偝傟傞
+		// 锟紾锟絅锟絏锟絴锟絒锟絞锟斤拷锟斤拷锟斤拷
 		ev=calloc(sizeof(struct event_data), 1);
 		buf=calloc(50, 1);
 		if (ev==NULL || buf==NULL) {
@@ -260,7 +260,7 @@ int npc_event_export(void *key,void *data,va_list ap)
 }
 
 /*==========================================
- * 慡偰偺NPC偺On*僀儀儞僩幚峴
+ * 锟絊锟侥傦拷NPC锟斤拷On*锟紺锟絰锟斤拷锟絞锟斤拷s
  *------------------------------------------
  */
 int npc_event_doall_sub(void *key,void *data,va_list ap)
@@ -338,7 +338,7 @@ int npc_event_do_l(const char *name, int rid, int argc, argrec_t *args)
 }
 
 /*==========================================
- * 帪寁僀儀儞僩幚峴
+ * 锟斤拷锟絭锟紺锟絰锟斤拷锟絞锟斤拷s
  *------------------------------------------
  */
 int npc_event_do_clock(int tid,unsigned int tick,int id,int data)
@@ -369,7 +369,7 @@ int npc_event_do_clock(int tid,unsigned int tick,int id,int data)
 	return c;
 }
 /*==========================================
- * OnInit僀儀儞僩幚峴(&帪寁僀儀儞僩奐巒)
+ * OnInit锟紺锟絰锟斤拷锟絞锟斤拷s(&锟斤拷锟絭锟紺锟絰锟斤拷锟絞锟絁锟絥)
  *------------------------------------------
  */
 int npc_event_do_oninit(void)
@@ -464,8 +464,8 @@ int npc_do_ontimer(int npc_id, struct map_session_data *sd, int option)
 	return 0;
 }
 /*==========================================
- * 僞僀儅乕僀儀儞僩梡儔儀儖偺庢傝崬傒
- * npc_parse_script->strdb_foreach偐傜屇偽傟傞
+ * 锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞锟絧锟斤拷锟絰锟斤拷锟教庯拷锟借崬锟斤拷
+ * npc_parse_script->strdb_foreach锟斤拷锟斤拷锟侥偽傦拷锟斤拷
  *------------------------------------------
  */
 int npc_timerevent_import(void *key,void *data,va_list ap)
@@ -476,7 +476,7 @@ int npc_timerevent_import(void *key,void *data,va_list ap)
 	int t=0,i=0;
 	
 	if(sscanf(lname,"OnTimer%d%n",&t,&i)==1 && lname[i]==':') {
-		// 僞僀儅乕僀儀儞僩
+		// 锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞
 		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));
@@ -499,7 +499,7 @@ int npc_timerevent_import(void *key,void *data,va_list ap)
 	return 0;
 }
 /*==========================================
- * 僞僀儅乕僀儀儞僩幚峴
+ * 锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞锟斤拷s
  *------------------------------------------
  */
 int npc_timerevent(int tid,unsigned int tick,int id,int data)
@@ -526,7 +526,7 @@ int npc_timerevent(int tid,unsigned int tick,int id,int data)
 	return 0;
 }
 /*==========================================
- * 僞僀儅乕僀儀儞僩奐巒
+ * 锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞锟絁锟絥
  *------------------------------------------
  */
 int npc_timerevent_start(struct npc_data *nd)
@@ -554,7 +554,7 @@ int npc_timerevent_start(struct npc_data *nd)
 	return 0;
 }
 /*==========================================
- * 僞僀儅乕僀儀儞僩廔椆
+ * 锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞锟絀锟斤拷
  *------------------------------------------
  */
 int npc_timerevent_stop(struct npc_data *nd)
@@ -571,7 +571,7 @@ int npc_timerevent_stop(struct npc_data *nd)
 	return 0;
 }
 /*==========================================
- * 僞僀儅乕抣偺強摼
+ * 锟絕锟紺锟絵锟絒锟絣锟教忥拷锟斤拷
  *------------------------------------------
  */
 int npc_gettimerevent_tick(struct npc_data *nd)
@@ -587,7 +587,7 @@ int npc_gettimerevent_tick(struct npc_data *nd)
 	return tick;
 }
 /*==========================================
- * 僞僀儅乕抣偺愝掕
+ * 锟絕锟紺锟絵锟絒锟絣锟教愝掞拷
  *------------------------------------------
  */
 int npc_settimerevent_tick(struct npc_data *nd,int newtimer)
@@ -606,7 +606,7 @@ int npc_settimerevent_tick(struct npc_data *nd,int newtimer)
 }
 
 /*==========================================
- * 僀儀儞僩宆偺NPC張棟
+ * 锟紺锟絰锟斤拷锟絞锟絕锟斤拷NPC锟斤拷锟斤拷
  *------------------------------------------
  */
 int npc_event(struct map_session_data *sd,const char *eventname,int mob_kill)
@@ -669,7 +669,7 @@ int npc_event(struct map_session_data *sd,const char *eventname,int mob_kill)
 		}
 		return 1;
 	}
-	if (nd->flag&1) {	// 柍岠壔偝傟偰偄傞
+	if (nd->flag&1) {	// 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥傦拷锟斤拷
 		npc_event_dequeue(sd);
 		return 0;
 	}
@@ -705,7 +705,7 @@ int npc_command(struct map_session_data *sd,char *npcname,char *command)
 	return 0;
 }
 /*==========================================
- * 愙怗宆偺NPC張棟
+ * 锟节怗锟絕锟斤拷NPC锟斤拷锟斤拷
  *------------------------------------------
  */
 int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
@@ -719,7 +719,7 @@ int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
 		return 1;
 
 	for(i=0;i<map[m].npc_num;i++) {
-		if (map[m].npc[i]->flag&1) {	// 柍岠壔偝傟偰偄傞
+		if (map[m].npc[i]->flag&1) {	// 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥傦拷锟斤拷
 			f=0;
 			continue;
 		}
@@ -772,7 +772,7 @@ int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
 }
 
 /*==========================================
- * 嬤偔偐偳偆偐偺敾掕
+ * 锟竭傦拷锟斤拷锟角傦拷锟斤拷锟教旓拷锟斤拷
  *------------------------------------------
  */
 int npc_checknear(struct map_session_data *sd,int id)
@@ -788,10 +788,10 @@ int npc_checknear(struct map_session_data *sd,int id)
 		return 1;
 	}
 	
-	if (nd->class<0)	// 僀儀儞僩宯偼忢偵OK
+	if (nd->class<0)	// 锟紺锟絰锟斤拷锟絞锟絥锟酵忥拷锟斤拷OK
 		return 0;
 
-	// 僄儕傾敾掕
+	// 锟紾锟斤拷锟紸锟斤拷锟斤拷
 	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)
@@ -801,7 +801,7 @@ int npc_checknear(struct map_session_data *sd,int id)
 }
 
 /*==========================================
- * 僋儕僢僋帪偺NPC張棟
+ * 锟絅锟斤拷锟絙锟絅锟斤拷锟斤拷NPC锟斤拷锟斤拷
  *------------------------------------------
  */
 int npc_click(struct map_session_data *sd,int id)
@@ -821,7 +821,7 @@ int npc_click(struct map_session_data *sd,int id)
 
 	nd=(struct npc_data *)map_id2bl(id);
 
-	if (nd->flag&1)	// 柍岠壔偝傟偰偄傞
+	if (nd->flag&1)	// 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥傦拷锟斤拷
 		return 1;
 
 	sd->npc_id=id;
@@ -890,7 +890,7 @@ int npc_buysellsel(struct map_session_data *sd,int id,int type)
 		sd->npc_id=0;
 		return 1;
 	}
-	if (nd->flag&1)	// 柍岠壔偝傟偰偄傞
+	if (nd->flag&1)	// 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥傦拷锟斤拷
 		return 1;
 
 	sd->npc_shopid=id;
@@ -949,11 +949,11 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
 		w+=itemdb_weight(item_list[i*2+1]) * item_list[i*2];
 	}
 	if (z > (double)sd->status.zeny)
-		return 1;	// zeny晄懌
+		return 1;	// zeny锟絪锟斤拷
 	if (w+sd->weight > sd->max_weight)
-		return 2;	// 廳検挻夁
+		return 2;	// 锟絛锟绞掞拷锟斤拷
 	if (pc_inventoryblank(sd)<new)
-		return 3;	// 庬椶悢挻夁
+		return 3;	// 锟斤拷锟睫愶拷锟斤拷锟斤拷
 	if (sd->trade_partner != 0)
 		return 4;	// cant buy while trading
 
@@ -968,7 +968,7 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
 			memset(&item_tmp,0,sizeof(item_tmp));
 
 			item_tmp.nameid = item_data->nameid;
-			item_tmp.identify = 1;	// npc斕攧傾僀僥儉偼娪掕嵪傒
+			item_tmp.identify = 1;	// npc锟教旓拷锟紸锟紺锟絜锟斤拷锟酵娪掞拷锟较傦拷
 
 			if (amount > 1 && (item_data->type == 4 || item_data->type == 5 || item_data->type == 7 || item_data->type == 8))
 			{
@@ -982,7 +982,7 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
 		}
 	}
 
-	//彜恖宱尡抣
+	//锟斤拷锟絣锟給锟斤拷锟絣
 /*	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);
@@ -1039,7 +1039,7 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
 		pc_delitem(sd,item_id,item_list[i*2+1],0);
 	}
 
-	//彜恖宱尡抣
+	//锟斤拷锟絣锟給锟斤拷锟絣
 /*	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);
@@ -1060,11 +1060,11 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
 }
 
 //
-// 弶婜壔娭學
+// 锟斤拷锟斤拷锟斤拷锟街學
 //
 
 /*==========================================
- * 撉傒崬傓npc僼傽僀儖偺僋儕傾
+ * 锟角傒嶏拷锟斤拷npc锟絫锟紷锟紺锟斤拷锟教僋锟斤拷锟紸
  *------------------------------------------
  */
 void npc_clearsrcfile()
@@ -1080,7 +1080,7 @@ void npc_clearsrcfile()
 	npc_src_last=NULL;
 }
 /*==========================================
- * 撉傒崬傓npc僼傽僀儖偺捛壛
+ * 锟角傒嶏拷锟斤拷npc锟絫锟紷锟紺锟斤拷锟教捛夛拷
  *------------------------------------------
  */
 void npc_addsrcfile(char *name)
@@ -1105,7 +1105,7 @@ void npc_addsrcfile(char *name)
 	npc_src_last=new;
 }
 /*==========================================
- * 撉傒崬傓npc僼傽僀儖偺嶍彍
+ * 锟角傒嶏拷锟斤拷npc锟絫锟紷锟紺锟斤拷锟教嶍彍
  *------------------------------------------
  */
 void npc_delsrcfile(char *name)
@@ -1129,7 +1129,7 @@ void npc_delsrcfile(char *name)
 }
 
 /*==========================================
- * warp峴夝愅
+ * warp锟絪锟斤拷锟斤拷
  *------------------------------------------
  */
 int npc_parse_warp(char *w1,char *w2,char *w3,char *w4)
@@ -1139,7 +1139,7 @@ int npc_parse_warp(char *w1,char *w2,char *w3,char *w4)
 	char mapname[24],to_mapname[24];
 	struct npc_data *nd;
 
-	// 堷悢偺屄悢僠僃僢僋
+	// 锟斤拷锟斤拷锟教屄愶拷锟絗锟紽锟絙锟絅
 	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);
@@ -1200,7 +1200,7 @@ int npc_parse_warp(char *w1,char *w2,char *w3,char *w4)
 }
 
 /*==========================================
- * shop峴夝愅
+ * shop锟絪锟斤拷锟斤拷
  *------------------------------------------
  */
 static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
@@ -1211,7 +1211,7 @@ static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
 	char mapname[24];
 	struct npc_data *nd;
 
-	// 堷悢偺屄悢僠僃僢僋
+	// 锟斤拷锟斤拷锟教屄愶拷锟絗锟紽锟絙锟絅
 	if (sscanf(w1, "%[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 ||
 	    strchr(w4, ',') == NULL) {
 		printf("bad shop line : %s\n", w3);
@@ -1226,7 +1226,7 @@ static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
 	while (p && pos < max) {
 		int nameid,value;
 		char name[24];
-		struct item_data *id;
+		struct item_data *id = NULL;
 		p++;
 		if (sscanf(p, "%d:%d", &nameid, &value) == 2) {
 		} else if (sscanf(p, "%s :%d", name, &value) == 2) {
@@ -1238,9 +1238,8 @@ static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
 		if (nameid > 0) {
 			nd->u.shop_item[pos].nameid = nameid;
 			if (value < 0) {
-				int temp = abs(value);
 				if (id == NULL) id = itemdb_search(nameid);
-				value = id->value_buy * temp;
+				value = id->value_buy * abs(value);
 
 			}
 			nd->u.shop_item[pos].value = value;
@@ -1285,7 +1284,7 @@ static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
 	return 0;
 }
 /*==========================================
- * NPC偺儔儀儖僨乕僞僐儞僶乕僩
+ * NPC锟教冿拷锟絰锟斤拷锟絝锟絒锟絕锟絉锟斤拷锟給锟絒锟絞
  *------------------------------------------
  */
 int npc_convertlabel_db(void *key,void *data,va_list ap)
@@ -1317,7 +1316,7 @@ int npc_convertlabel_db(void *key,void *data,va_list ap)
 	return 0;
 }
 /*==========================================
- * script峴夝愅
+ * script锟絪锟斤拷锟斤拷
  *------------------------------------------
  */
 static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line,FILE *fp,int *lines)
@@ -1340,7 +1339,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 	if(strcmp(w1,"-")==0){
 		x=0;y=0;m=-1;
 	}else{
-	// 堷悢偺屄悢僠僃僢僋
+	// 锟斤拷锟斤拷锟教屄愶拷锟絗锟紽锟絙锟絅
 	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);
@@ -1350,7 +1349,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 	}
 
 	if(strcmp(w2,"script")==0){
-		// 僗僋儕僾僩偺夝愅
+		// 锟絏锟絅锟斤拷锟絭锟絞锟教夛拷锟斤拷
 		srcbuf=(char *)aCalloc(srcsize,sizeof(char));
 	if (strchr(first_line,'{')) {
 		strcpy(srcbuf,strchr(first_line,'{'));
@@ -1386,7 +1385,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 	}
 
 	}else{
-		// duplicate偡傞
+		// duplicate锟斤拷锟斤拷
 		
 		char srcname[128];
 		struct npc_data *nd2;
@@ -1403,15 +1402,15 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 		label_dupnum=nd2->u.scr.label_list_num;
 		src_id=nd2->bl.id;
 	
-	}// end of 僗僋儕僾僩夝愅
+	}// end of 锟絏锟絅锟斤拷锟絭锟絞锟斤拷锟斤拷
 
 	nd=(struct npc_data *)aCalloc(1,sizeof(struct npc_data));
 
 	if(m==-1){
-		// 僗僋儕僾僩僐僺乕梡偺僟儈乕NPC
+		// 锟絏锟絅锟斤拷锟絭锟絞锟絉锟絪锟絒锟絧锟教僟锟絶锟絒NPC
 		
 	}else if( sscanf(w4,"%d,%d,%d",&class,&xs,&ys)==3) {
-		// 愙怗宆NPC
+		// 锟节怗锟絕NPC
 		int i,j;
 		
 		if (xs>=0)xs=xs*2+1;
@@ -1432,13 +1431,13 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 		
 		nd->u.scr.xs=xs;
 		nd->u.scr.ys=ys;
-	} else {	// 僋儕僢僋宆NPC
+	} else {	// 锟絅锟斤拷锟絙锟絅锟絕NPC
 		class=atoi(w4);
 		nd->u.scr.xs=0;
 		nd->u.scr.ys=0;
 	}
 	
-	if (class<0 && m>=0) {	// 僀儀儞僩宆NPC
+	if (class<0 && m>=0) {	// 锟紺锟絰锟斤拷锟絞锟絕NPC
 		evflag=1;
 	}
 
@@ -1479,7 +1478,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 	nd->n=map_addnpc(m,nd);
 	map_addblock(&nd->bl);
 
-	if (evflag) {	// 僀儀儞僩宆
+	if (evflag) {	// 锟紺锟絰锟斤拷锟絞锟絕
 			struct event_data *ev=(struct event_data *)aCalloc(1,sizeof(struct event_data));
 			ev->nd=nd;
 			ev->pos=0;
@@ -1491,15 +1490,15 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 
 
 	//-----------------------------------------
-	// 儔儀儖僨乕僞偺弨旛	
+	// 锟斤拷锟絰锟斤拷锟絝锟絒锟絕锟教忥拷锟斤拷	
 	if(srcbuf){
-		// script杮懱偑偁傞応崌偺張棟
+		// script锟絳锟教傦拷锟斤拷锟斤拷锟疥崌锟教忥拷锟斤拷
 		
-		// 儔儀儖僨乕僞偺僐儞僶乕僩
+		// 锟斤拷锟絰锟斤拷锟絝锟絒锟絕锟教僐锟斤拷锟給锟絒锟絞
 	label_db=script_get_label_db();
 		strdb_foreach(label_db,npc_convertlabel_db,nd);
 	
-		// 傕偆巊傢側偄偺偱僶僢僼傽夝曻
+		// 锟斤拷锟絞锟斤拷锟饺傦拷锟教偱僶锟絙锟絫锟紷锟斤拷锟斤拷
 		free(srcbuf);
 
 	}else{
@@ -1508,12 +1507,12 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 //		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;	// 儔儀儖僨乕僞嫟桳
+		nd->u.scr.label_list=label_dup;	// 锟斤拷锟絰锟斤拷锟絝锟絒锟絕锟斤拷锟絃
 		nd->u.scr.label_list_num=label_dupnum;
 	}
 
 	//-----------------------------------------
-	// 僀儀儞僩梡儔儀儖僨乕僞偺僄僋僗億乕僩
+	// 锟紺锟絰锟斤拷锟絞锟絧锟斤拷锟絰锟斤拷锟絝锟絒锟絕锟教僄锟絅锟絏锟絴锟絒锟絞
 	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;
@@ -1521,7 +1520,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 		if ((lname[0]=='O' || lname[0]=='o')&&(lname[1]=='N' || lname[1]=='n')) {
 			struct event_data *ev;
 			char *buf;
-			// 僄僋僗億乕僩偝傟傞
+			// 锟紾锟絅锟絏锟絴锟絒锟絞锟斤拷锟斤拷锟斤拷
 			ev=(struct event_data *)aCalloc(1,sizeof(struct event_data));
 			buf=(char *)aCalloc(50,sizeof(char));
 			if (strlen(lname)>24) {
@@ -1537,13 +1536,13 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 	}
 	
 	//-----------------------------------------
-	// 儔儀儖僨乕僞偐傜僞僀儅乕僀儀儞僩庢傝崬傒
+	// 锟斤拷锟絰锟斤拷锟絝锟絒锟絕锟斤拷锟斤拷锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞锟斤拷锟借崬锟斤拷
 	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') {
-			// 僞僀儅乕僀儀儞僩
+			// 锟絕锟紺锟絵锟絒锟紺锟絰锟斤拷锟絞
 			struct npc_timerevent_list *te=nd->u.scr.timer_event;
 			int j,k=nd->u.scr.timeramount;
 			if(te==NULL)
@@ -1569,7 +1568,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
 }
 
 /*==========================================
- * function峴夝愅
+ * function锟絪锟斤拷锟斤拷
  *------------------------------------------
  */
 static int npc_parse_function(char *w1,char *w2,char *w3,char *w4,char *first_line,FILE *fp,int *lines)
@@ -1582,7 +1581,7 @@ static int npc_parse_function(char *w1,char *w2,char *w3,char *w4,char *first_li
 //	struct dbt *label_db;
 	char *p;
 
-	// 僗僋儕僾僩偺夝愅
+	// 锟絏锟絅锟斤拷锟絭锟絞锟教夛拷锟斤拷
 	srcbuf=(char *)aCalloc(srcsize,sizeof(char));
 	if (strchr(first_line,'{')) {
 		strcpy(srcbuf,strchr(first_line,'{'));
@@ -1624,7 +1623,7 @@ static int npc_parse_function(char *w1,char *w2,char *w3,char *w4,char *first_li
 
 //	label_db=script_get_label_db();
 
-	// 傕偆巊傢側偄偺偱僶僢僼傽夝曻
+	// 锟斤拷锟絞锟斤拷锟饺傦拷锟教偱僶锟絙锟絫锟紷锟斤拷锟斤拷
 	free(srcbuf);
 	
 //	printf("function %s => %p\n",p,script);
@@ -1634,7 +1633,7 @@ static int npc_parse_function(char *w1,char *w2,char *w3,char *w4,char *first_li
 
 
 /*==========================================
- * mob峴夝愅
+ * mob锟絪锟斤拷锟斤拷
  *------------------------------------------
  */
 int npc_parse_mob(char *w1,char *w2,char *w3,char *w4)
@@ -1647,7 +1646,7 @@ int npc_parse_mob(char *w1,char *w2,char *w3,char *w4)
 
 	xs=ys=0;
 	delay1=delay2=0;
-	// 堷悢偺屄悢僠僃僢僋
+	// 锟斤拷锟斤拷锟教屄愶拷锟絗锟紽锟絙锟絅
 	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);
@@ -1714,7 +1713,7 @@ int npc_parse_mob(char *w1,char *w2,char *w3,char *w4)
 }
 
 /*==========================================
- * 儅僢僾僼儔僌峴偺夝愅
+ * 锟絵锟絙锟絭锟絫锟斤拷锟絆锟絪锟教夛拷锟斤拷
  *------------------------------------------
  */
 static int npc_parse_mapflag(char *w1,char *w2,char *w3,char *w4)
@@ -1725,7 +1724,7 @@ static int npc_parse_mapflag(char *w1,char *w2,char *w3,char *w4)
 	char drop_arg1[16],drop_arg2[16];
 	int drop_id=0,drop_type=0,drop_per=0;
 
-	// 堷悢偺屄悢僠僃僢僋
+	// 锟斤拷锟斤拷锟教屄愶拷锟絗锟紽锟絙锟絅
 //	if (	sscanf(w1,"%[^,],%d,%d,%d",mapname,&x,&y,&dir) != 4 )
 	if (	sscanf(w1,"%[^,]",mapname) != 1 )
 		return 1;
@@ -1734,7 +1733,7 @@ static int npc_parse_mapflag(char *w1,char *w2,char *w3,char *w4)
 	if (m<0)
 		return 1;
 
-//儅僢僾僼儔僌
+//锟絵锟絙锟絭锟絫锟斤拷锟絆
 	if ( strcmpi(w3,"nosave")==0) {
 		if (strcmp(w4,"SavePoint")==0) {
 			memcpy(map[m].save.map,"SavePoint",16);
@@ -1944,7 +1943,7 @@ npc_free(struct npc_data *nd)
 }
 
 /*==========================================
- * 廔椆
+ * 锟絀锟斤拷
  *------------------------------------------
  */
 int do_final_npc(void)
@@ -1987,7 +1986,7 @@ void ev_release(struct dbn *db, int which)
 }
 
 /*==========================================
- * npc弶婜壔
+ * npc锟斤拷锟斤拷锟斤拷
  *------------------------------------------
  */
 int do_init_npc(void)
@@ -2022,7 +2021,7 @@ int do_init_npc(void)
 
 			if (line[0] == '/' && line[1] == '/')
 				continue;
-			// 晄梫側僗儁乕僗傗僞僽偺楢懕偼媗傔傞
+			// 锟絪锟絭锟饺僗锟統锟絒锟絏锟斤拷锟絕锟絬锟教楢锟斤拷锟酵媗锟竭傦拷
 			for(i=j=0;line[i];i++) {
 				if (line[i]==' ') {
 					if (!((line[i+1] && (isspace(line[i+1]) || line[i+1]==',')) ||
@@ -2034,12 +2033,12 @@ int do_init_npc(void)
 				} else
  					line[j++]=line[i];
 			}
-			// 嵟弶偼僞僽嬫愗傝偱僠僃僢僋偟偰傒偰丄僟儊側傜僗儁乕僗嬫愗傝偱妋擣
+			// 锟脚忥拷锟酵僞锟絬锟斤拷锟截傦拷锟脚僠锟紽锟絙锟絅锟斤拷锟侥傒偰丄锟絖锟斤拷锟饺傦拷锟絏锟統锟絒锟絏锟斤拷锟截傦拷锟脚妋锟紽
 			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;
 			}
-			// 儅僢僾偺懚嵼妋擣
+			// 锟絵锟絙锟絭锟教戯拷锟捷妋锟紽
 			if( strcmp(w1,"-")!=0 && strcmpi(w1,"function")!=0 ){
 			sscanf(w1,"%[^,]",mapname);
 			m = map_mapname2mapid(mapname);
author	Jared Adams <jaxad0127@gmail.com>	2009-04-18 20:42:53 -0600
committer	Jared Adams <jaxad0127@gmail.com>	2009-04-18 20:42:53 -0600
commit	b7470529eab877bbc581e821c6673e98dec696b8 (patch)
tree	309eb728918c720f9fdeb7642532b8db0be7a822 /src/map
parent	25d9040b9e3b71d6534a7dedbfe34364f2a7ad66 (diff)
download	tmwa-b7470529eab877bbc581e821c6673e98dec696b8.tar.gz tmwa-b7470529eab877bbc581e821c6673e98dec696b8.tar.bz2 tmwa-b7470529eab877bbc581e821c6673e98dec696b8.tar.xz tmwa-b7470529eab877bbc581e821c6673e98dec696b8.zip