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/char/int_party.c | 82 ++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'src/char/int_party.c') diff --git a/src/char/int_party.c b/src/char/int_party.c index fb9c3ca..c501c74 100644 --- a/src/char/int_party.c +++ b/src/char/int_party.c @@ -19,7 +19,7 @@ int mapif_party_broken (int party_id, int flag); int party_check_empty (struct party *p); int mapif_parse_PartyLeave (int fd, int party_id, int account_id); -// ƒp[ƒeƒBƒf[ƒ^‚Ì•¶Žš—ñ‚Ö‚Ì•ÏŠ· +// パーティデータã®æ–‡å­—列ã¸ã®å¤‰æ› int inter_party_tostr (char *str, struct party *p) { int i, len; @@ -38,7 +38,7 @@ int inter_party_tostr (char *str, struct party *p) return 0; } -// ƒp[ƒeƒBƒf[ƒ^‚Ì•¶Žš—ñ‚©‚ç‚Ì•ÏŠ· +// パーティデータã®æ–‡å­—列ã‹ã‚‰ã®å¤‰æ› int inter_party_fromstr (char *str, struct party *p) { int i, j; @@ -86,7 +86,7 @@ int inter_party_fromstr (char *str, struct party *p) return 0; } -// ƒp[ƒeƒBƒf[ƒ^‚̃[ƒh +// パーティデータã®ãƒ­ãƒ¼ãƒ‰ int inter_party_init () { char line[8192]; @@ -138,7 +138,7 @@ int inter_party_init () return 0; } -// ƒp[ƒeƒB[ƒf[ƒ^‚̃Z[ƒu—p +// パーティーデータã®ã‚»ãƒ¼ãƒ–用 int inter_party_save_sub (void *key, void *data, va_list ap) { char line[8192]; @@ -151,7 +151,7 @@ int inter_party_save_sub (void *key, void *data, va_list ap) return 0; } -// ƒp[ƒeƒB[ƒf[ƒ^‚̃Z[ƒu +// パーティーデータã®ã‚»ãƒ¼ãƒ– int inter_party_save () { FILE *fp; @@ -171,7 +171,7 @@ int inter_party_save () return 0; } -// ƒp[ƒeƒB–¼ŒŸõ—p +// パーティå検索用 int search_partyname_sub (void *key, void *data, va_list ap) { struct party *p = (struct party *) data, **dst; @@ -185,7 +185,7 @@ int search_partyname_sub (void *key, void *data, va_list ap) return 0; } -// ƒp[ƒeƒB–¼ŒŸõ +// パーティå検索 struct party *search_partyname (char *str) { struct party *p = NULL; @@ -194,7 +194,7 @@ struct party *search_partyname (char *str) return p; } -// EXPŒö•½•ª”z‚Å‚«‚é‚©ƒ`ƒFƒbƒN +// EXP公平分é…ã§ãã‚‹ã‹ãƒã‚§ãƒƒã‚¯ int party_check_exp_share (struct party *p) { int i; @@ -215,7 +215,7 @@ int party_check_exp_share (struct party *p) return (maxlv == 0 || maxlv - minlv <= party_share_level); } -// ƒp[ƒeƒB‚ª‹ó‚©‚Ç‚¤‚©ƒ`ƒFƒbƒN +// パーティãŒç©ºã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ int party_check_empty (struct party *p) { int i; @@ -229,7 +229,7 @@ int party_check_empty (struct party *p) return 0; } } - // ’N‚à‚¢‚È‚¢‚̂ʼnðŽU + // 誰もã„ãªã„ã®ã§è§£æ•£ mapif_party_broken (p->party_id, 0); numdb_erase (party_db, p->party_id); free (p); @@ -237,7 +237,7 @@ int party_check_empty (struct party *p) return 1; } -// ƒLƒƒƒ‰‚Ì‹£‡‚ª‚È‚¢‚©ƒ`ƒFƒbƒN—p +// キャラã®ç«¶åˆãŒãªã„ã‹ãƒã‚§ãƒƒã‚¯ç”¨ int party_check_conflict_sub (void *key, void *data, va_list ap) { struct party *p = (struct party *) data; @@ -248,7 +248,7 @@ int party_check_conflict_sub (void *key, void *data, va_list ap) account_id = va_arg (ap, int); nick = va_arg (ap, char *); - if (p->party_id == party_id) // –{—ˆ‚ÌŠ‘®‚È‚Ì‚Å–â‘è‚È‚µ + if (p->party_id == party_id) // 本æ¥ã®æ‰€å±žãªã®ã§å•é¡Œãªã— return 0; for (i = 0; i < MAX_PARTY; i++) @@ -256,7 +256,7 @@ int party_check_conflict_sub (void *key, void *data, va_list ap) if (p->member[i].account_id == account_id && strcmp (p->member[i].name, nick) == 0) { - // •Ê‚̃p[ƒeƒB‚É‹U‚ÌŠ‘®ƒf[ƒ^‚ª‚ ‚é‚Ì‚Å’E‘Þ + // 別ã®ãƒ‘ーティã«å½ã®æ‰€å±žãƒ‡ãƒ¼ã‚¿ãŒã‚ã‚‹ã®ã§è„±é€€ printf ("int_party: party conflict! %d %d %d\n", account_id, party_id, p->party_id); mapif_parse_PartyLeave (-1, p->party_id, account_id); @@ -266,7 +266,7 @@ int party_check_conflict_sub (void *key, void *data, va_list ap) return 0; } -// ƒLƒƒƒ‰‚Ì‹£‡‚ª‚È‚¢‚©ƒ`ƒFƒbƒN +// キャラã®ç«¶åˆãŒãªã„ã‹ãƒã‚§ãƒƒã‚¯ int party_check_conflict (int party_id, int account_id, char *nick) { numdb_foreach (party_db, party_check_conflict_sub, party_id, account_id, @@ -276,9 +276,9 @@ int party_check_conflict (int party_id, int account_id, char *nick) } //------------------------------------------------------------------- -// map server‚Ö‚Ì’ÊM +// map serverã¸ã®é€šä¿¡ -// ƒp[ƒeƒBì¬‰Â”Û +// パーティ作æˆå¯å¦ int mapif_party_created (int fd, int account_id, struct party *p) { WFIFOW (fd, 0) = 0x3820; @@ -301,7 +301,7 @@ int mapif_party_created (int fd, int account_id, struct party *p) return 0; } -// ƒp[ƒeƒBî•ñŒ©‚‚©‚炸 +// パーティ情報見ã¤ã‹ã‚‰ãš int mapif_party_noinfo (int fd, int party_id) { WFIFOW (fd, 0) = 0x3821; @@ -313,7 +313,7 @@ int mapif_party_noinfo (int fd, int party_id) return 0; } -// ƒp[ƒeƒBî•ñ‚Ü‚Æ‚ß‘—‚è +// パーティ情報ã¾ã¨ã‚é€ã‚Š int mapif_party_info (int fd, struct party *p) { unsigned char buf[4 + sizeof (struct party)]; @@ -330,7 +330,7 @@ int mapif_party_info (int fd, struct party *p) return 0; } -// ƒp[ƒeƒBƒƒ“ƒo’ljÁ‰Â”Û +// パーティメンãƒè¿½åŠ å¯å¦ int mapif_party_memberadded (int fd, int party_id, int account_id, int flag) { WFIFOW (fd, 0) = 0x3822; @@ -342,7 +342,7 @@ int mapif_party_memberadded (int fd, int party_id, int account_id, int flag) return 0; } -// ƒp[ƒeƒBÝ’è•ÏX’Ê’m +// パーティ設定変更通知 int mapif_party_optionchanged (int fd, struct party *p, int account_id, int flag) { @@ -364,7 +364,7 @@ int mapif_party_optionchanged (int fd, struct party *p, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Þ’Ê’m +// パーティ脱退通知 int mapif_party_leaved (int party_id, int account_id, char *name) { unsigned char buf[34]; @@ -379,7 +379,7 @@ int mapif_party_leaved (int party_id, int account_id, char *name) return 0; } -// ƒp[ƒeƒBƒ}ƒbƒvXV’Ê’m +// パーティマップ更新通知 int mapif_party_membermoved (struct party *p, int idx) { unsigned char buf[29]; @@ -395,7 +395,7 @@ int mapif_party_membermoved (struct party *p, int idx) return 0; } -// ƒp[ƒeƒB‰ðŽU’Ê’m +// パーティ解散通知 int mapif_party_broken (int party_id, int flag) { unsigned char buf[7]; @@ -408,7 +408,7 @@ int mapif_party_broken (int party_id, int flag) return 0; } -// ƒp[ƒeƒB“à”­Œ¾ +// パーティ内発言 int mapif_party_message (int party_id, int account_id, char *mes, int len) { unsigned char buf[len + 12]; @@ -424,9 +424,9 @@ int mapif_party_message (int party_id, int account_id, char *mes, int len) } //------------------------------------------------------------------- -// map server‚©‚ç‚Ì’ÊM +// map serverã‹ã‚‰ã®é€šä¿¡ -// ƒp[ƒeƒB +// パーティ int mapif_parse_CreateParty (int fd, int account_id, char *name, char *nick, char *map, int lv) { @@ -476,7 +476,7 @@ int mapif_parse_CreateParty (int fd, int account_id, char *name, char *nick, return 0; } -// ƒp[ƒeƒBî•ñ—v‹ +// パーティ情報è¦æ±‚ int mapif_parse_PartyInfo (int fd, int party_id) { struct party *p; @@ -490,7 +490,7 @@ int mapif_parse_PartyInfo (int fd, int party_id) return 0; } -// ƒp[ƒeƒB’ljÁ—v‹ +// パーティ追加è¦æ±‚ int mapif_parse_PartyAddMember (int fd, int party_id, int account_id, char *nick, char *map, int lv) { @@ -534,7 +534,7 @@ int mapif_parse_PartyAddMember (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB[Ý’è•ÏX—v‹ +// パーティー設定変更è¦æ±‚ int mapif_parse_PartyChangeOption (int fd, int party_id, int account_id, int exp, int item) { @@ -558,7 +558,7 @@ int mapif_parse_PartyChangeOption (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Þ—v‹ +// パーティ脱退è¦æ±‚ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) { struct party *p; @@ -575,7 +575,7 @@ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) memset (&p->member[i], 0, sizeof (struct party_member)); if (party_check_empty (p) == 0) - mapif_party_info (-1, p); // ‚Ü‚¾l‚ª‚¢‚é‚̂Ńf[ƒ^‘—M + mapif_party_info (-1, p); // ã¾ã äººãŒã„ã‚‹ã®ã§ãƒ‡ãƒ¼ã‚¿é€ä¿¡ return 0; } } @@ -584,7 +584,7 @@ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) return 0; } -// ƒp[ƒeƒBƒ}ƒbƒvXV—v‹ +// パーティマップ更新è¦æ±‚ int mapif_parse_PartyChangeMap (int fd, int party_id, int account_id, char *map, int online, int lv) { @@ -620,7 +620,7 @@ int mapif_parse_PartyChangeMap (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB‰ðŽU—v‹ +// パーティ解散è¦æ±‚ int mapif_parse_BreakParty (int fd, int party_id) { struct party *p; @@ -635,24 +635,24 @@ int mapif_parse_BreakParty (int fd, int party_id) return 0; } -// ƒp[ƒeƒBƒƒbƒZ[ƒW‘—M +// パーティメッセージé€ä¿¡ int mapif_parse_PartyMessage (int fd, int party_id, int account_id, char *mes, int len) { return mapif_party_message (party_id, account_id, mes, len); } -// ƒp[ƒeƒBƒ`ƒFƒbƒN—v‹ +// パーティãƒã‚§ãƒƒã‚¯è¦æ±‚ int mapif_parse_PartyCheck (int fd, int party_id, int account_id, char *nick) { return party_check_conflict (party_id, account_id, nick); } -// map server ‚©‚ç‚Ì’ÊM -// E‚PƒpƒPƒbƒg‚̂݉ðÍ‚·‚邱‚Æ -// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚µ‚Ä‚¨‚­‚±‚Æ -// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚͌ĂÑo‚µŒ³‚Ås‚í‚ê‚é‚Ì‚Ås‚Á‚Ä‚Í‚È‚ç‚È‚¢ -// EƒGƒ‰[‚È‚ç0(false)A‚»‚¤‚Å‚È‚¢‚È‚ç1(true)‚ð‚©‚¦‚³‚È‚¯‚ê‚΂Ȃç‚È‚¢ +// map server ã‹ã‚‰ã®é€šä¿¡ +// ・1パケットã®ã¿è§£æžã™ã‚‹ã“㨠+// ・パケット長データã¯inter.cã«ã‚»ãƒƒãƒˆã—ã¦ãŠãã“㨠+// ・パケット長ãƒã‚§ãƒƒã‚¯ã‚„ã€RFIFOSKIPã¯å‘¼ã³å‡ºã—å…ƒã§è¡Œã‚れるã®ã§è¡Œã£ã¦ã¯ãªã‚‰ãªã„ +// ・エラーãªã‚‰0(false)ã€ãã†ã§ãªã„ãªã‚‰1(true)ã‚’ã‹ãˆã•ãªã‘ã‚Œã°ãªã‚‰ãªã„ int inter_party_parse_frommap (int fd) { switch (RFIFOW (fd, 0)) @@ -700,7 +700,7 @@ int inter_party_parse_frommap (int fd) return 1; } -// ƒT[ƒo[‚©‚ç’E‘Þ—v‹iƒLƒƒƒ‰íœ—pj +// サーãƒãƒ¼ã‹ã‚‰è„±é€€è¦æ±‚(キャラ削除用) int inter_party_leave (int party_id, int account_id) { return mapif_parse_PartyLeave (-1, party_id, account_id); -- cgit v1.2.3-60-g2f50