From a1a2711abfc594f2be1da51df95ddcd7071ddebd Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Mar 2011 13:52:33 -0800 Subject: Recode from SHIFT-JIS to unicode, then undo the conversion of backslashs and tildes. --- src/map/map.c | 258 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 129 insertions(+), 129 deletions(-) (limited to 'src/map/map.c') diff --git a/src/map/map.c b/src/map/map.c index 19a7528..57183d1 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -40,7 +40,7 @@ #include "memwatch.h" #endif -// ‹É—Í static‚Ń[ƒJƒ‹‚ÉŽû‚ß‚é +// 極力 staticã§ãƒ­ãƒ¼ã‚«ãƒ«ã«åŽã‚ã‚‹ static struct dbt *id_db = NULL; static struct dbt *map_db = NULL; static struct dbt *nick_db = NULL; @@ -80,8 +80,8 @@ char help_txt[256] = "conf/help.txt"; char wisp_server_name[24] = "Server"; // can be modified in char-server configuration file /*========================================== - * ‘SmapŽI‘Œv‚Å‚ÌÚ‘±”Ý’è - * (charŽI‚©‚ç‘—‚ç‚ê‚Ä‚­‚é) + * å…¨map鯖ç·è¨ˆã§ã®æŽ¥ç¶šæ•°è¨­å®š + * (char鯖ã‹ã‚‰é€ã‚‰ã‚Œã¦ãã‚‹) *------------------------------------------ */ void map_setusers (int n) @@ -90,7 +90,7 @@ void map_setusers (int n) } /*========================================== - * ‘SmapŽI‘Œv‚Å‚ÌÚ‘±”Žæ“¾ (/w‚ւ̉ž“š—p) + * å…¨map鯖ç·è¨ˆã§ã®æŽ¥ç¶šæ•°å–å¾— (/wã¸ã®å¿œç­”用) *------------------------------------------ */ int map_getusers (void) @@ -99,12 +99,12 @@ int map_getusers (void) } // -// block휂̈À‘S«Šm•Ûˆ— +// block削除ã®å®‰å…¨æ€§ç¢ºä¿å‡¦ç† // /*========================================== - * block‚ðfree‚·‚é‚Æ‚«free‚Ì•Ï‚í‚è‚ÉŒÄ‚Ô - * ƒƒbƒN‚³‚ê‚Ä‚¢‚é‚Æ‚«‚̓oƒbƒtƒ@‚É‚½‚ß‚é + * blockã‚’freeã™ã‚‹ã¨ãfreeã®å¤‰ã‚ã‚Šã«å‘¼ã¶ + * ロックã•ã‚Œã¦ã„ã‚‹ã¨ãã¯ãƒãƒƒãƒ•ã‚¡ã«ãŸã‚ã‚‹ *------------------------------------------ */ int map_freeblock (void *bl) @@ -130,7 +130,7 @@ int map_freeblock (void *bl) } /*========================================== - * block‚Ìfree‚ðˆêŽž“I‚É‹ÖŽ~‚·‚é + * blockã®freeを一時的ã«ç¦æ­¢ã™ã‚‹ *------------------------------------------ */ int map_freeblock_lock (void) @@ -139,9 +139,9 @@ int map_freeblock_lock (void) } /*========================================== - * block‚Ìfree‚̃ƒbƒN‚ð‰ðœ‚·‚é - * ‚±‚Ì‚Æ‚«AƒƒbƒN‚ªŠ®‘S‚É‚È‚­‚È‚é‚Æ - * ƒoƒbƒtƒ@‚É‚½‚Ü‚Á‚Ä‚¢‚½block‚ð‘S•”íœ + * blockã®freeã®ãƒ­ãƒƒã‚¯ã‚’解除ã™ã‚‹ + * ã“ã®ã¨ãã€ãƒ­ãƒƒã‚¯ãŒå®Œå…¨ã«ãªããªã‚‹ã¨ + * ãƒãƒƒãƒ•ã‚¡ã«ãŸã¾ã£ã¦ã„ãŸblockを全部削除 *------------------------------------------ */ int map_freeblock_unlock (void) @@ -169,20 +169,20 @@ int map_freeblock_unlock (void) } // -// block‰»ˆ— +// blockåŒ–å‡¦ç† // /*========================================== - * map[]‚Ìblock_list‚©‚çŒq‚ª‚Á‚Ä‚¢‚éê‡‚É - * bl->prev‚Ébl_head‚̃AƒhƒŒƒX‚ð“ü‚ê‚Ä‚¨‚­ + * map[]ã®block_listã‹ã‚‰ç¹‹ãŒã£ã¦ã„ã‚‹å ´åˆã« + * bl->prevã«bl_headã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’入れã¦ãŠã *------------------------------------------ */ static struct block_list bl_head; /*========================================== - * map[]‚Ìblock_list‚ɒljÁ - * mob‚Í”‚ª‘½‚¢‚̂ŕʃŠƒXƒg + * map[]ã®block_listã«è¿½åŠ  + * mobã¯æ•°ãŒå¤šã„ã®ã§åˆ¥ãƒªã‚¹ãƒˆ * - * Šù‚ÉlinkÏ‚Ý‚©‚ÌŠm”F‚ª–³‚¢BŠëŒ¯‚©‚à + * æ—¢ã«link済ã¿ã‹ã®ç¢ºèªãŒç„¡ã„。å±é™ºã‹ã‚‚ *------------------------------------------ */ int map_addblock (struct block_list *bl) @@ -233,8 +233,8 @@ int map_addblock (struct block_list *bl) } /*========================================== - * map[]‚Ìblock_list‚©‚çŠO‚· - * prev‚ªNULL‚Ìê‡list‚ÉŒq‚ª‚Á‚Ä‚È‚¢ + * map[]ã®block_listã‹ã‚‰å¤–ã™ + * prevãŒNULLã®å ´åˆlistã«ç¹‹ãŒã£ã¦ãªã„ *------------------------------------------ */ int map_delblock (struct block_list *bl) @@ -242,12 +242,12 @@ int map_delblock (struct block_list *bl) int b; nullpo_retr (0, bl); - // Šù‚Éblocklist‚©‚甲‚¯‚Ä‚¢‚é + // æ—¢ã«blocklistã‹ã‚‰æŠœã‘ã¦ã„ã‚‹ if (bl->prev == NULL) { if (bl->next != NULL) { - // prev‚ªNULL‚Ånext‚ªNULL‚Å‚È‚¢‚Ì‚Í—L‚Á‚Ä‚Í‚È‚ç‚È‚¢ + // prevãŒNULLã§nextãŒNULLã§ãªã„ã®ã¯æœ‰ã£ã¦ã¯ãªã‚‰ãªã„ if (battle_config.error_log) printf ("map_delblock error : bl->next!=NULL\n"); } @@ -263,7 +263,7 @@ int map_delblock (struct block_list *bl) bl->next->prev = bl->prev; if (bl->prev == &bl_head) { - // ƒŠƒXƒg‚Ì“ª‚È‚Ì‚ÅAmap[]‚Ìblock_list‚ðXV‚·‚é + // リストã®é ­ãªã®ã§ã€map[]ã®block_listã‚’æ›´æ–°ã™ã‚‹ if (bl->type == BL_MOB) { map[bl->m].block_mob[b] = bl->next; @@ -288,7 +288,7 @@ int map_delblock (struct block_list *bl) } /*========================================== - * ŽüˆÍ‚ÌPCl”‚𔂦‚é (Œ»Ý–¢Žg—p) + * 周囲ã®PC人数を数ãˆã‚‹ (ç¾åœ¨æœªä½¿ç”¨) *------------------------------------------ */ int map_countnearpc (int m, int x, int y) @@ -320,7 +320,7 @@ int map_countnearpc (int m, int x, int y) } /*========================================== - * ƒZƒ‹ã‚ÌPC‚ÆMOB‚Ì”‚𔂦‚é (ƒOƒ‰ƒ“ƒhƒNƒƒX—p) + * セル上ã®PCã¨MOBã®æ•°ã‚’æ•°ãˆã‚‹ (グランドクロス用) *------------------------------------------ */ int map_count_oncell (int m, int x, int y) @@ -355,9 +355,9 @@ int map_count_oncell (int m, int x, int y) } /*========================================== - * map m (x0,y0)-(x1,y1)“à‚Ì‘Sobj‚ɑ΂µ‚Ä - * func‚ðŒÄ‚Ô - * type!=0 ‚È‚ç‚»‚ÌŽí—Þ‚Ì‚Ý + * map m (x0,y0)-(x1,y1)内ã®å…¨objã«å¯¾ã—㦠+ * funcを呼㶠+ * type!=0 ãªã‚‰ãã®ç¨®é¡žã®ã¿ *------------------------------------------ */ void map_foreachinarea (int (*func) (struct block_list *, va_list), int m, @@ -418,24 +418,24 @@ void map_foreachinarea (int (*func) (struct block_list *, va_list), int m, printf ("map_foreachinarea: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉ð•ú‚ð‹ÖŽ~‚·‚é + map_freeblock_lock (); // メモリã‹ã‚‰ã®è§£æ”¾ã‚’ç¦æ­¢ã™ã‚‹ for (i = blockcount; i < bl_list_count; i++) - if (bl_list[i]->prev) // —LŒø‚©‚Ç‚¤‚©ƒ`ƒFƒbƒN + if (bl_list[i]->prev) // 有効ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ func (bl_list[i], ap); - map_freeblock_unlock (); // ‰ð•ú‚ð‹–‰Â‚·‚é + map_freeblock_unlock (); // 解放を許å¯ã™ã‚‹ va_end (ap); bl_list_count = blockcount; } /*========================================== - * ‹éŒ`(x0,y0)-(x1,y1)‚ª(dx,dy)ˆÚ“®‚µ‚½Žž‚Ì - * —̈æŠO‚É‚È‚é—̈æ(‹éŒ`‚©LŽšŒ`)“à‚Ìobj‚É - * ‘΂µ‚Äfunc‚ðŒÄ‚Ô + * 矩形(x0,y0)-(x1,y1)ãŒ(dx,dy)移動ã—ãŸæ™‚ã® + * 領域外ã«ãªã‚‹é ˜åŸŸ(矩形ã‹Lå­—å½¢)内ã®objã« + * 対ã—ã¦funcを呼㶠* - * dx,dy‚Í-1,0,1‚Ì‚Ý‚Æ‚·‚éi‚Ç‚ñ‚È’l‚Å‚à‚¢‚¢‚Á‚Û‚¢Hj + * dx,dyã¯-1,0,1ã®ã¿ã¨ã™ã‚‹ï¼ˆã©ã‚“ãªå€¤ã§ã‚‚ã„ã„ã£ã½ã„?) *------------------------------------------ */ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, @@ -450,7 +450,7 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, va_start (ap, type); if (dx == 0 || dy == 0) { - // ‹éŒ`—̈æ‚Ìê‡ + // 矩形領域ã®å ´åˆ if (dx == 0) { if (dy < 0) @@ -510,7 +510,7 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, } else { - // LŽš—̈æ‚Ìê‡ + // L字領域ã®å ´åˆ if (x0 < 0) x0 = 0; @@ -573,13 +573,13 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, printf ("map_foreachinarea: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉ð•ú‚ð‹ÖŽ~‚·‚é + map_freeblock_lock (); // メモリã‹ã‚‰ã®è§£æ”¾ã‚’ç¦æ­¢ã™ã‚‹ for (i = blockcount; i < bl_list_count; i++) - if (bl_list[i]->prev) // —LŒø‚©‚Ç‚¤‚©ƒ`ƒFƒbƒN + if (bl_list[i]->prev) // 有効ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ func (bl_list[i], ap); - map_freeblock_unlock (); // ‰ð•ú‚ð‹–‰Â‚·‚é + map_freeblock_unlock (); // 解放を許å¯ã™ã‚‹ va_end (ap); bl_list_count = blockcount; @@ -632,23 +632,23 @@ void map_foreachincell (int (*func) (struct block_list *, va_list), int m, printf ("map_foreachincell: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉ð•ú‚ð‹ÖŽ~‚·‚é + map_freeblock_lock (); // メモリã‹ã‚‰ã®è§£æ”¾ã‚’ç¦æ­¢ã™ã‚‹ for (i = blockcount; i < bl_list_count; i++) - if (bl_list[i]->prev) // —LŒø‚©‚Ç‚¤‚©ƒ`ƒFƒbƒN + if (bl_list[i]->prev) // 有効ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ func (bl_list[i], ap); - map_freeblock_unlock (); // ‰ð•ú‚ð‹–‰Â‚·‚é + map_freeblock_unlock (); // 解放を許å¯ã™ã‚‹ va_end (ap); bl_list_count = blockcount; } /*========================================== - * °ƒAƒCƒeƒ€‚âƒGƒtƒFƒNƒg—p‚̈ꎞobjŠ„‚è“–‚Ä - * object[]‚Ö‚Ì•Û‘¶‚Æid_db“o˜^‚Ü‚Å + * 床アイテムやエフェクト用ã®ä¸€æ™‚obj割り当㦠+ * object[]ã¸ã®ä¿å­˜ã¨id_db登録ã¾ã§ * - * bl->id‚à‚±‚Ì’†‚Åݒ肵‚Ä–â‘è–³‚¢? + * bl->idã‚‚ã“ã®ä¸­ã§è¨­å®šã—ã¦å•é¡Œç„¡ã„? *------------------------------------------ */ int map_addobject (struct block_list *bl) @@ -679,8 +679,8 @@ int map_addobject (struct block_list *bl) } /*========================================== - * ˆêŽžobject‚̉ð•ú - * map_delobject‚Ìfree‚µ‚È‚¢ƒo[ƒWƒ‡ƒ“ + * 一時objectã®è§£æ”¾ + * map_delobjectã®freeã—ãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ *------------------------------------------ */ int map_delobjectnofree (int id, int type) @@ -710,11 +710,11 @@ int map_delobjectnofree (int id, int type) } /*========================================== - * ˆêŽžobject‚̉ð•ú - * block_list‚©‚ç‚ÌíœAid_db‚©‚ç‚Ìíœ - * object data‚ÌfreeAobject[]‚Ö‚ÌNULL‘ã“ü + * 一時objectã®è§£æ”¾ + * block_listã‹ã‚‰ã®å‰Šé™¤ã€id_dbã‹ã‚‰ã®å‰Šé™¤ + * object dataã®freeã€object[]ã¸ã®NULL代入 * - * add‚Æ‚Ì‘ÎÌ«‚ª–³‚¢‚Ì‚ª‹C‚É‚È‚é + * addã¨ã®å¯¾ç§°æ€§ãŒç„¡ã„ã®ãŒæ°—ã«ãªã‚‹ *------------------------------------------ */ int map_delobject (int id, int type) @@ -734,7 +734,7 @@ int map_delobject (int id, int type) } /*========================================== - * ‘SˆêŽžobj‘ŠŽè‚Éfunc‚ðŒÄ‚Ô + * 全一時obj相手ã«funcを呼㶠* *------------------------------------------ */ @@ -776,13 +776,13 @@ void map_foreachobject (int (*func) (struct block_list *, va_list), int type, } /*========================================== - * °ƒAƒCƒeƒ€‚ðÁ‚· + * 床アイテムを消㙠* - * data==0‚ÌŽž‚Ítimer‚ÅÁ‚¦‚½Žž - * data!=0‚ÌŽž‚ÍE‚¤“™‚ÅÁ‚¦‚½Žž‚Æ‚µ‚Ä“®ì + * data==0ã®æ™‚ã¯timerã§æ¶ˆãˆãŸæ™‚ + * data!=0ã®æ™‚ã¯æ‹¾ã†ç­‰ã§æ¶ˆãˆãŸæ™‚ã¨ã—ã¦å‹•ä½œ * - * ŒãŽÒ‚ÍAmap_clearflooritem(id)‚Ö - * map.h“à‚Å#define‚µ‚Ä‚ ‚é + * 後者ã¯ã€map_clearflooritem(id)㸠+ * map.h内ã§#defineã—ã¦ã‚ã‚‹ *------------------------------------------ */ int map_clearflooritem_timer (int tid, unsigned int tick, int id, int data) @@ -806,10 +806,10 @@ int map_clearflooritem_timer (int tid, unsigned int tick, int id, int data) } /*========================================== - * (m,x,y)‚ÌŽüˆÍrangeƒ}ƒX“à‚Ì‹ó‚«(=N“ü‰Â”\)cell‚Ì - * “à‚©‚ç“K“–‚ȃ}ƒX–Ú‚ÌÀ•W‚ðx+(y<<16)‚Å•Ô‚· + * (m,x,y)ã®å‘¨å›²rangeマス内ã®ç©ºã(=侵入å¯èƒ½)cellã® + * 内ã‹ã‚‰é©å½“ãªãƒžã‚¹ç›®ã®åº§æ¨™ã‚’x+(y<<16)ã§è¿”ã™ * - * Œ»órange=1‚ŃAƒCƒeƒ€ƒhƒƒbƒv—p“r‚Ì‚Ý + * ç¾çŠ¶range=1ã§ã‚¢ã‚¤ãƒ†ãƒ ãƒ‰ãƒ­ãƒƒãƒ—用途ã®ã¿ *------------------------------------------ */ int map_searchrandfreecell (int m, int x, int y, int range) @@ -857,9 +857,9 @@ int map_searchrandfreecell (int m, int x, int y, int range) } /*========================================== - * (m,x,y)‚ð’†S‚É3x3ˆÈ“à‚É°ƒAƒCƒeƒ€Ý’u + * (m,x,y)を中心ã«3x3以内ã«åºŠã‚¢ã‚¤ãƒ†ãƒ è¨­ç½® * - * item_data‚ÍamountˆÈŠO‚ðcopy‚·‚é + * item_dataã¯amount以外をcopyã™ã‚‹ *------------------------------------------ */ int map_addflooritem_any (struct item *item_data, int amount, int m, int x, @@ -1019,7 +1019,7 @@ int map_addflooritem (struct item *item_data, int amount, int m, int x, int y, /* } */ /*========================================== - * charid_db‚֒ljÁ(•ÔM‘Ò‚¿‚ª‚ ‚ê‚ΕÔM) + * charid_dbã¸è¿½åŠ (返信待ã¡ãŒã‚ã‚Œã°è¿”ä¿¡) *------------------------------------------ */ void map_addchariddb (int charid, char *name) @@ -1029,7 +1029,7 @@ void map_addchariddb (int charid, char *name) p = numdb_search (charid_db, charid); if (p == NULL) - { // ƒf[ƒ^ƒx[ƒX‚É‚È‚¢ + { // データベースã«ãªã„ p = (struct charid2nick *) aCalloc (1, sizeof (struct charid2nick)); p->req_id = 0; } @@ -1041,7 +1041,7 @@ void map_addchariddb (int charid, char *name) p->req_id = 0; numdb_insert (charid_db, charid, p); if (req) - { // •ÔM‘Ò‚¿‚ª‚ ‚ê‚ΕÔM + { // 返信待ã¡ãŒã‚ã‚Œã°è¿”ä¿¡ struct map_session_data *sd = map_id2sd (req); if (sd != NULL) clif_solved_charname (sd, charid); @@ -1049,7 +1049,7 @@ void map_addchariddb (int charid, char *name) } /*========================================== - * charid_db‚֒ljÁi•ÔM—v‹‚Ì‚Ýj + * charid_dbã¸è¿½åŠ ï¼ˆè¿”ä¿¡è¦æ±‚ã®ã¿ï¼‰ *------------------------------------------ */ int map_reqchariddb (struct map_session_data *sd, int charid) @@ -1059,7 +1059,7 @@ int map_reqchariddb (struct map_session_data *sd, int charid) nullpo_retr (0, sd); p = numdb_search (charid_db, charid); - if (p != NULL) // ƒf[ƒ^ƒx[ƒX‚É‚·‚Å‚É‚ ‚é + if (p != NULL) // データベースã«ã™ã§ã«ã‚ã‚‹ return 0; p = (struct charid2nick *) aCalloc (1, sizeof (struct charid2nick)); p->req_id = sd->bl.id; @@ -1068,7 +1068,7 @@ int map_reqchariddb (struct map_session_data *sd, int charid) } /*========================================== - * id_db‚Öbl‚ð’ljÁ + * id_dbã¸blを追加 *------------------------------------------ */ void map_addiddb (struct block_list *bl) @@ -1079,7 +1079,7 @@ void map_addiddb (struct block_list *bl) } /*========================================== - * id_db‚©‚çbl‚ðíœ + * id_dbã‹ã‚‰blを削除 *------------------------------------------ */ void map_deliddb (struct block_list *bl) @@ -1090,7 +1090,7 @@ void map_deliddb (struct block_list *bl) } /*========================================== - * nick_db‚Ösd‚ð’ljÁ + * nick_dbã¸sdを追加 *------------------------------------------ */ void map_addnickdb (struct map_session_data *sd) @@ -1101,43 +1101,43 @@ void map_addnickdb (struct map_session_data *sd) } /*========================================== - * PC‚Ìquitˆ— map.c“à•ª + * PCã®quitå‡¦ç† map.c内分 * - * quitˆ—‚ÌŽå‘Ì‚ªˆá‚¤‚悤‚È‹C‚à‚µ‚Ä‚«‚½ + * quit処ç†ã®ä¸»ä½“ãŒé•ã†ã‚ˆã†ãªæ°—ã‚‚ã—ã¦ã㟠*------------------------------------------ */ int map_quit (struct map_session_data *sd) { nullpo_retr (0, sd); - if (sd->chatID) // ƒ`ƒƒƒbƒg‚©‚ço‚é + if (sd->chatID) // ãƒãƒ£ãƒƒãƒˆã‹ã‚‰å‡ºã‚‹ chat_leavechat (sd); - if (sd->trade_partner) // Žæˆø‚ð’†’f‚·‚é + if (sd->trade_partner) // å–引を中断ã™ã‚‹ trade_tradecancel (sd); - if (sd->party_invite > 0) // ƒp[ƒeƒBŠ©—U‚ð‹‘”Û‚·‚é + if (sd->party_invite > 0) // パーティ勧誘を拒å¦ã™ã‚‹ party_reply_invite (sd, sd->party_invite_account, 0); - if (sd->guild_invite > 0) // ƒMƒ‹ƒhŠ©—U‚ð‹‘”Û‚·‚é + if (sd->guild_invite > 0) // ギルド勧誘を拒å¦ã™ã‚‹ guild_reply_invite (sd, sd->guild_invite, 0); - if (sd->guild_alliance > 0) // ƒMƒ‹ƒh“¯–¿Š©—U‚ð‹‘”Û‚·‚é + if (sd->guild_alliance > 0) // ギルドåŒç›Ÿå‹§èª˜ã‚’æ‹’å¦ã™ã‚‹ guild_reply_reqalliance (sd, sd->guild_alliance_account, 0); - party_send_logout (sd); // ƒp[ƒeƒB‚̃ƒOƒAƒEƒgƒƒbƒZ[ƒW‘—M + party_send_logout (sd); // パーティã®ãƒ­ã‚°ã‚¢ã‚¦ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸é€ä¿¡ - guild_send_memberinfoshort (sd, 0); // ƒMƒ‹ƒh‚̃ƒOƒAƒEƒgƒƒbƒZ[ƒW‘—M + guild_send_memberinfoshort (sd, 0); // ギルドã®ãƒ­ã‚°ã‚¢ã‚¦ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸é€ä¿¡ - pc_cleareventtimer (sd); // ƒCƒxƒ“ƒgƒ^ƒCƒ}‚ð”jŠü‚·‚é + pc_cleareventtimer (sd); // イベントタイマを破棄ã™ã‚‹ - skill_castcancel (&sd->bl, 0); // ‰r¥‚ð’†’f‚·‚é - skill_stop_dancing (&sd->bl, 1); // ƒ_ƒ“ƒX/‰‰‘t’†’f + skill_castcancel (&sd->bl, 0); // 詠唱を中断ã™ã‚‹ + skill_stop_dancing (&sd->bl, 1); // ダンス/æ¼”å¥ä¸­æ–­ - if (sd->sc_data && sd->sc_data[SC_BERSERK].timer != -1) //ƒo[ƒT[ƒN’†‚ÌI—¹‚ÍHP‚ð100‚É + if (sd->sc_data && sd->sc_data[SC_BERSERK].timer != -1) //ãƒãƒ¼ã‚µãƒ¼ã‚¯ä¸­ã®çµ‚了ã¯HPã‚’100ã« sd->status.hp = 100; - skill_status_change_clear (&sd->bl, 1); // ƒXƒe[ƒ^ƒXˆÙí‚ð‰ðœ‚·‚é - skill_clear_unitgroup (&sd->bl); // ƒXƒLƒ‹ƒ†ƒjƒbƒgƒOƒ‹[ƒv‚Ìíœ + skill_status_change_clear (&sd->bl, 1); // ステータス異常を解除ã™ã‚‹ + skill_clear_unitgroup (&sd->bl); // スキルユニットグループã®å‰Šé™¤ skill_cleartimerskill (&sd->bl); pc_stop_walking (sd, 0); pc_stopattack (sd); @@ -1152,7 +1152,7 @@ int map_quit (struct map_session_data *sd) if (pc_isdead (sd)) pc_setrestartvalue (sd, 2); pc_makesavestatus (sd); - //ƒNƒ[ƒ“ƒXƒLƒ‹‚ÅŠo‚¦‚½ƒXƒLƒ‹‚ÍÁ‚· + //クローンスキルã§è¦šãˆãŸã‚¹ã‚­ãƒ«ã¯æ¶ˆã™ //The storage closing routines will save the char if needed. [Skotlex] if (!sd->state.storage_flag) @@ -1175,7 +1175,7 @@ int map_quit (struct map_session_data *sd) } /*========================================== - * id”Ô†‚ÌPC‚ð’T‚·B‹‚È‚¯‚ê‚ÎNULL + * id番å·ã®PCを探ã™ã€‚å±…ãªã‘ã‚Œã°NULL *------------------------------------------ */ struct map_session_data *map_id2sd (int id) @@ -1205,7 +1205,7 @@ struct map_session_data *map_id2sd (int id) } /*========================================== - * char_id”Ô†‚Ì–¼‘O‚ð’T‚· + * char_id番å·ã®åå‰ã‚’探㙠*------------------------------------------ */ char *map_charid2nick (int id) @@ -1322,8 +1322,8 @@ struct map_session_data *map_nick2sd (char *nick) } /*========================================== - * id”Ô†‚Ì•¨‚ð’T‚· - * ˆêŽžobject‚Ìꇂ͔z—ñ‚ðˆø‚­‚Ì‚Ý + * id番å·ã®ç‰©ã‚’探㙠+ * 一時objectã®å ´åˆã¯é…列を引ãã®ã¿ *------------------------------------------ */ struct block_list *map_id2bl (int id) @@ -1338,7 +1338,7 @@ struct block_list *map_id2bl (int id) } /*========================================== - * id_db“à‚Ì‘S‚Ä‚Éfunc‚ðŽÀs + * id_db内ã®å…¨ã¦ã«funcを実行 *------------------------------------------ */ int map_foreachiddb (int (*func) (void *, void *, va_list), ...) @@ -1352,7 +1352,7 @@ int map_foreachiddb (int (*func) (void *, void *, va_list), ...) } /*========================================== - * map.npc‚֒ljÁ (warp“™‚̗̈掂¿‚Ì‚Ý) + * map.npcã¸è¿½åŠ  (warpç­‰ã®é ˜åŸŸæŒã¡ã®ã¿) *------------------------------------------ */ int map_addnpc (int m, struct npc_data *nd) @@ -1411,7 +1411,7 @@ void map_removenpc (void) } /*========================================== - * map–¼‚©‚çmap”Ô†‚Ö•ÏŠ· + * mapåã‹ã‚‰map番å·ã¸å¤‰æ› *------------------------------------------ */ int map_mapname2mapid (char *name) @@ -1425,7 +1425,7 @@ int map_mapname2mapid (char *name) } /*========================================== - * ‘¼ŽImap–¼‚©‚çip,port•ÏŠ· + * 他鯖mapåã‹ã‚‰ip,portå¤‰æ› *------------------------------------------ */ int map_mapname2ipport (char *name, int *ip, int *port) @@ -1487,7 +1487,7 @@ int map_check_dir (int s_dir, int t_dir) } /*========================================== - * ”Þ‰ä‚Ì•ûŒü‚ðŒvŽZ + * 彼我ã®æ–¹å‘を計算 *------------------------------------------ */ int map_calc_dir (struct block_list *src, int x, int y) @@ -1500,47 +1500,47 @@ int map_calc_dir (struct block_list *src, int x, int y) dx = x - src->x; dy = y - src->y; if (dx == 0 && dy == 0) - { // ”Þ‰ä‚Ìꊈê’v - dir = 0; // ã + { // 彼我ã®å ´æ‰€ä¸€è‡´ + dir = 0; // 上 } else if (dx >= 0 && dy >= 0) - { // •ûŒü“I‚ɉEã - dir = 7; // ‰Eã + { // æ–¹å‘çš„ã«å³ä¸Š + dir = 7; // å³ä¸Š if (dx * 3 - 1 < dy) - dir = 0; // ã + dir = 0; // 上 if (dx > dy * 3) - dir = 6; // ‰E + dir = 6; // å³ } else if (dx >= 0 && dy <= 0) - { // •ûŒü“I‚ɉE‰º - dir = 5; // ‰E‰º + { // æ–¹å‘çš„ã«å³ä¸‹ + dir = 5; // å³ä¸‹ if (dx * 3 - 1 < -dy) - dir = 4; // ‰º + dir = 4; // 下 if (dx > -dy * 3) - dir = 6; // ‰E + dir = 6; // å³ } else if (dx <= 0 && dy <= 0) - { // •ûŒü“I‚ɶ‰º - dir = 3; // ¶‰º + { // æ–¹å‘çš„ã«å·¦ä¸‹ + dir = 3; // 左下 if (dx * 3 + 1 > dy) - dir = 4; // ‰º + dir = 4; // 下 if (dx < dy * 3) - dir = 2; // ¶ + dir = 2; // å·¦ } else - { // •ûŒü“I‚ɶã - dir = 1; // ¶ã + { // æ–¹å‘çš„ã«å·¦ä¸Š + dir = 1; // 左上 if (-dx * 3 - 1 < dy) - dir = 0; // ã + dir = 0; // 上 if (-dx > dy * 3) - dir = 2; // ¶ + dir = 2; // å·¦ } return dir; } -// gatŒn +// gatç³» /*========================================== - * (m,x,y)‚Ìó‘Ԃ𒲂ׂé + * (m,x,y)ã®çŠ¶æ…‹ã‚’調ã¹ã‚‹ *------------------------------------------ */ int map_getcell (int m, int x, int y) @@ -1551,7 +1551,7 @@ int map_getcell (int m, int x, int y) } /*========================================== - * (m,x,y)‚Ìó‘Ô‚ðt‚É‚·‚é + * (m,x,y)ã®çŠ¶æ…‹ã‚’tã«ã™ã‚‹ *------------------------------------------ */ int map_setcell (int m, int x, int y, int t) @@ -1562,7 +1562,7 @@ int map_setcell (int m, int x, int y, int t) } /*========================================== - * ‘¼ŽIŠÇ—‚̃}ƒbƒv‚ðdb‚ɒljÁ + * 他鯖管ç†ã®ãƒžãƒƒãƒ—ã‚’dbã«è¿½åŠ  *------------------------------------------ */ int map_setipport (char *name, unsigned long ip, int port) @@ -1604,9 +1604,9 @@ int map_setipport (char *name, unsigned long ip, int port) return 0; } -// ‰Šú‰»Žü‚è +// åˆæœŸåŒ–周り /*========================================== - * …ê‚‚³Ý’è + * 水場高ã•è¨­å®š *------------------------------------------ */ static struct @@ -1663,7 +1663,7 @@ static void map_readwater (char *watertxt) } /*========================================== - * ƒ}ƒbƒv1–‡“Ç‚Ýž‚Ý + * マップ1枚読ã¿è¾¼ã¿ *------------------------------------------ */ static int map_readmap (int m, char *fn, char *alias) @@ -1709,7 +1709,7 @@ static int map_readmap (int m, char *fn, char *alias) for (x = 0; x < xs; x++) { /*if(wh!=NO_WATER && p->type==0){ - * // …ê”»’è + * // 水場判定 * map[m].gat[x+y*xs]=(p->high[0]>wh || p->high[1]>wh || p->high[2]>wh || p->high[3]>wh) ? 3 : 0; * } else { */ map[m].gat[x + y * xs] = p->type; @@ -1763,7 +1763,7 @@ static int map_readmap (int m, char *fn, char *alias) } /*========================================== - * ‘S‚Ä‚Ìmapƒf[ƒ^‚ð“Ç‚Ýž‚Þ + * å…¨ã¦ã®mapデータを読ã¿è¾¼ã‚€ *------------------------------------------ */ int map_readallmap (void) @@ -1771,7 +1771,7 @@ int map_readallmap (void) int i, maps_removed = 0; char fn[256] = ""; - // æ‚É‘S•”‚̃ƒbƒv‚Ì‘¶Ý‚ðŠm”F + // å…ˆã«å…¨éƒ¨ã®ãƒ£bプã®å­˜åœ¨ã‚’ç¢ºèª for (i = 0; i < map_num; i++) { if (strstr (map[i].name, ".gat") == NULL) @@ -1820,7 +1820,7 @@ int map_readallmap (void) } /*========================================== - * “Ç‚Ýž‚Þmap‚ð’ljÁ‚·‚é + * 読ã¿è¾¼ã‚€mapを追加ã™ã‚‹ *------------------------------------------ */ int map_addmap (char *mapname) @@ -1842,7 +1842,7 @@ int map_addmap (char *mapname) } /*========================================== - * “Ç‚Ýž‚Þmap‚ð휂·‚é + * 読ã¿è¾¼ã‚€mapを削除ã™ã‚‹ *------------------------------------------ */ int map_delmap (char *mapname) @@ -1938,7 +1938,7 @@ void map_write_log (char *format, ...) } /*========================================== - * Ý’èƒtƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Þ + * 設定ファイルを読ã¿è¾¼ã‚€ *------------------------------------------ */ int map_config_read (char *cfgName) @@ -2130,7 +2130,7 @@ static int cleanup_sub (struct block_list *bl, va_list ap) } /*========================================== - * mapŽII—¹Žžˆ— + * mapé¯–çµ‚äº†æ™‚å‡¦ç† *------------------------------------------ */ void do_final (void) @@ -2248,7 +2248,7 @@ int do_init (int argc, char *argv[]) do_init_chrif (); do_init_clif (); do_init_itemdb (); - do_init_mob (); // npc‚̉Šú‰»Žž“à‚Åmob_spawn‚µ‚ÄAmob_db‚ðŽQÆ‚·‚é‚Ì‚Åinit_npc‚æ‚èæ + do_init_mob (); // npcã®åˆæœŸåŒ–時内ã§mob_spawnã—ã¦ã€mob_dbã‚’å‚ç…§ã™ã‚‹ã®ã§init_npcより先 do_init_script (); do_init_npc (); do_init_pc (); @@ -2258,7 +2258,7 @@ int do_init (int argc, char *argv[]) do_init_skill (); do_init_magic (); - npc_event_do_oninit (); // npc‚ÌOnInitƒCƒxƒ“ƒgŽÀs + npc_event_do_oninit (); // npcã®OnInitイベント実行 if (battle_config.pk_mode == 1) printf ("The server is running in \033[1;31mPK Mode\033[0m.\n"); -- cgit v1.2.3-60-g2f50