From a1a2711abfc594f2be1da51df95ddcd7071ddebd Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
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/intif.c | 136 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

(limited to 'src/map/intif.c')

diff --git a/src/map/intif.c b/src/map/intif.c
index 6945486..efde695 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -48,11 +48,11 @@ static const int packet_len_table[] = {
     11, -1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-extern int char_fd;             // inter server‚Ìfd‚Íchar_fd‚ðŽg‚¤
-#define inter_fd (char_fd)      // ƒGƒCƒŠƒAƒX
+extern int char_fd;             // inter server�fd�char_fdを使�
+#define inter_fd (char_fd)      // エイリアス
 
 //-----------------------------------------------------------------
-// inter server‚Ö‚Ì‘—�M
+// inter server���信
 
 // Message for all GMs on all map servers
 int intif_GMmessage (char *mes, int len, int flag)
@@ -120,7 +120,7 @@ int intif_wis_message_to_gm (char *Wisp_name, int min_gm_level, char *mes,
     return 0;
 }
 
-// ƒAƒJƒEƒ“ƒg•Ï�”‘—�M
+// アカウント変数�信
 int intif_saveaccountreg (struct map_session_data *sd)
 {
     int  j, p;
@@ -139,7 +139,7 @@ int intif_saveaccountreg (struct map_session_data *sd)
     return 0;
 }
 
-// ƒAƒJƒEƒ“ƒg•Ï�”—v‹�
+// アカウント変数�求
 int intif_request_accountreg (struct map_session_data *sd)
 {
     nullpo_retr (0, sd);
@@ -150,7 +150,7 @@ int intif_request_accountreg (struct map_session_data *sd)
     return 0;
 }
 
-// ‘qŒÉƒf�[ƒ^—v‹�
+// 倉庫データ�求
 int intif_request_storage (int account_id)
 {
     WFIFOW (inter_fd, 0) = 0x3010;
@@ -159,7 +159,7 @@ int intif_request_storage (int account_id)
     return 0;
 }
 
-// ‘qŒÉƒf�[ƒ^‘—�M
+// 倉庫データ�信
 int intif_send_storage (struct storage *stor)
 {
     nullpo_retr (0, stor);
@@ -191,7 +191,7 @@ int intif_send_guild_storage (int account_id, struct guild_storage *gstor)
     return 0;
 }
 
-// ƒp�[ƒeƒB�ì�¬—v‹�
+// パーティ作��求
 int intif_create_party (struct map_session_data *sd, char *name)
 {
     nullpo_retr (0, sd);
@@ -208,7 +208,7 @@ int intif_create_party (struct map_session_data *sd, char *name)
     return 0;
 }
 
-// ƒp�[ƒeƒB�î•ñ—v‹�
+// パーティ情報�求
 int intif_request_partyinfo (int party_id)
 {
     WFIFOW (inter_fd, 0) = 0x3021;
@@ -219,7 +219,7 @@ int intif_request_partyinfo (int party_id)
     return 0;
 }
 
-// ƒp�[ƒeƒB’ljÁ—v‹�
+// パーティ追加�求
 int intif_party_addmember (int party_id, int account_id)
 {
     struct map_session_data *sd;
@@ -239,7 +239,7 @@ int intif_party_addmember (int party_id, int account_id)
     return 0;
 }
 
-// ƒp�[ƒeƒB�Ý’è•Ï�X
+// パーティ設定変更
 int intif_party_changeoption (int party_id, int account_id, int exp, int item)
 {
     WFIFOW (inter_fd, 0) = 0x3023;
@@ -251,7 +251,7 @@ int intif_party_changeoption (int party_id, int account_id, int exp, int item)
     return 0;
 }
 
-// ƒp�[ƒeƒB’E‘Þ—v‹�
+// パーティ脱退�求
 int intif_party_leave (int party_id, int account_id)
 {
 //  if(battle_config.etc_log)
@@ -263,7 +263,7 @@ int intif_party_leave (int party_id, int account_id)
     return 0;
 }
 
-// ƒp�[ƒeƒBˆÚ“®—v‹�
+// パーティ移動�求
 int intif_party_changemap (struct map_session_data *sd, int online)
 {
     if (sd != NULL)
@@ -281,7 +281,7 @@ int intif_party_changemap (struct map_session_data *sd, int online)
     return 0;
 }
 
-// ƒp�[ƒeƒB�[‰ðŽU—v‹�
+// パーティー解散�求
 int intif_break_party (int party_id)
 {
     WFIFOW (inter_fd, 0) = 0x3026;
@@ -290,7 +290,7 @@ int intif_break_party (int party_id)
     return 0;
 }
 
-// ƒp�[ƒeƒB‰ï˜b‘—�M
+// パーティ会話�信
 int intif_party_message (int party_id, int account_id, char *mes, int len)
 {
 //  if(battle_config.etc_log)
@@ -304,7 +304,7 @@ int intif_party_message (int party_id, int account_id, char *mes, int len)
     return 0;
 }
 
-// ƒp�[ƒeƒB‹£�‡ƒ`ƒFƒbƒN—v‹�
+// パーティ競��ェック�求
 int intif_party_checkconflict (int party_id, int account_id, char *nick)
 {
     WFIFOW (inter_fd, 0) = 0x3028;
@@ -315,7 +315,7 @@ int intif_party_checkconflict (int party_id, int account_id, char *nick)
     return 0;
 }
 
-// ƒMƒ‹ƒh�ì�¬—v‹�
+// ギルド作��求
 int intif_guild_create (const char *name, const struct guild_member *master)
 {
     nullpo_retr (0, master);
@@ -329,7 +329,7 @@ int intif_guild_create (const char *name, const struct guild_member *master)
     return 0;
 }
 
-// ƒMƒ‹ƒh�î•ñ—v‹�
+// ギルド情報�求
 int intif_guild_request_info (int guild_id)
 {
     WFIFOW (inter_fd, 0) = 0x3031;
@@ -338,7 +338,7 @@ int intif_guild_request_info (int guild_id)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo’ljÁ—v‹�
+// ギルドメン�追加�求
 int intif_guild_addmember (int guild_id, struct guild_member *m)
 {
     WFIFOW (inter_fd, 0) = 0x3032;
@@ -349,7 +349,7 @@ int intif_guild_addmember (int guild_id, struct guild_member *m)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo’E‘Þ/’Ç•ú—v‹�
+// ギルドメン�脱退/追放�求
 int intif_guild_leave (int guild_id, int account_id, int char_id, int flag,
                        const char *mes)
 {
@@ -363,7 +363,7 @@ int intif_guild_leave (int guild_id, int account_id, int char_id, int flag,
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo‚̃Iƒ“ƒ‰ƒCƒ“�ó‹µ/Lv�X�V—v‹�
+// ギルドメン��オンライン状�/Lv更新�求
 int intif_guild_memberinfoshort (int guild_id,
                                  int account_id, int char_id, int online,
                                  int lv, int class)
@@ -379,7 +379,7 @@ int intif_guild_memberinfoshort (int guild_id,
     return 0;
 }
 
-// ƒMƒ‹ƒh‰ðŽU’Ê’m
+// ギルド解散通知
 int intif_guild_break (int guild_id)
 {
     WFIFOW (inter_fd, 0) = 0x3036;
@@ -388,7 +388,7 @@ int intif_guild_break (int guild_id)
     return 0;
 }
 
-// ƒMƒ‹ƒh‰ï˜b‘—�M
+// ギルド会話�信
 int intif_guild_message (int guild_id, int account_id, char *mes, int len)
 {
     WFIFOW (inter_fd, 0) = 0x3037;
@@ -400,7 +400,7 @@ int intif_guild_message (int guild_id, int account_id, char *mes, int len)
     return 0;
 }
 
-// ƒMƒ‹ƒh‹£�‡ƒ`ƒFƒbƒN—v‹�
+// ギルド競��ェック�求
 int intif_guild_checkconflict (int guild_id, int account_id, int char_id)
 {
     WFIFOW (inter_fd, 0) = 0x3038;
@@ -411,7 +411,7 @@ int intif_guild_checkconflict (int guild_id, int account_id, int char_id)
     return 0;
 }
 
-// ƒMƒ‹ƒhŠî–{�î•ñ•Ï�X—v‹�
+// ギルド基本情報変更�求
 int intif_guild_change_basicinfo (int guild_id, int type, const void *data,
                                   int len)
 {
@@ -424,7 +424,7 @@ int intif_guild_change_basicinfo (int guild_id, int type, const void *data,
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo�î•ñ•Ï�X—v‹�
+// ギルドメン�情報変更�求
 int intif_guild_change_memberinfo (int guild_id, int account_id, int char_id,
                                    int type, const void *data, int len)
 {
@@ -439,7 +439,7 @@ int intif_guild_change_memberinfo (int guild_id, int account_id, int char_id,
     return 0;
 }
 
-// ƒMƒ‹ƒh–ð�E•Ï�X—v‹�
+// ギルド役�変更�求
 int intif_guild_position (int guild_id, int idx, struct guild_position *p)
 {
     WFIFOW (inter_fd, 0) = 0x303b;
@@ -451,7 +451,7 @@ int intif_guild_position (int guild_id, int idx, struct guild_position *p)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒXƒLƒ‹ƒAƒbƒv—v‹�
+// ギルドスキルアップ�求
 int intif_guild_skillup (int guild_id, int skill_num, int account_id)
 {
     WFIFOW (inter_fd, 0) = 0x303c;
@@ -462,7 +462,7 @@ int intif_guild_skillup (int guild_id, int skill_num, int account_id)
     return 0;
 }
 
-// ƒMƒ‹ƒh“¯–¿/“G‘Ηv‹�
+// ギルド�盟/敵対�求
 int intif_guild_alliance (int guild_id1, int guild_id2, int account_id1,
                           int account_id2, int flag)
 {
@@ -476,7 +476,7 @@ int intif_guild_alliance (int guild_id1, int guild_id2, int account_id1,
     return 0;
 }
 
-// ƒMƒ‹ƒh��’m•Ï�X—v‹�
+// ギルド告知変更�求
 int intif_guild_notice (int guild_id, const char *mes1, const char *mes2)
 {
     WFIFOW (inter_fd, 0) = 0x303e;
@@ -487,7 +487,7 @@ int intif_guild_notice (int guild_id, const char *mes1, const char *mes2)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•Ï�X—v‹�
+// ギルドエンブレム変更�求
 int intif_guild_emblem (int guild_id, int len, const char *data)
 {
     if (guild_id <= 0 || len < 0 || len > 2000)
@@ -501,7 +501,7 @@ int intif_guild_emblem (int guild_id, int len, const char *data)
     return 0;
 }
 
-//Œ»�݂̃Mƒ‹ƒh�é�è—̃Mƒ‹ƒh‚𒲂ׂé
+//�在�ギルド城�領ギルドを調�る
 int intif_guild_castle_dataload (int castle_id, int index)
 {
     WFIFOW (inter_fd, 0) = 0x3040;
@@ -511,7 +511,7 @@ int intif_guild_castle_dataload (int castle_id, int index)
     return 0;
 }
 
-//ƒMƒ‹ƒh�é�è—̃Mƒ‹ƒh•Ï�X—v‹�
+//ギルド城�領ギルド変更�求
 int intif_guild_castle_datasave (int castle_id, int index, int value)
 {
     WFIFOW (inter_fd, 0) = 0x3041;
@@ -615,7 +615,7 @@ int mapif_parse_WisToGM (int fd)
     return 0;
 }
 
-// ƒAƒJƒEƒ“ƒg•Ï�”’Ê’m
+// アカウント変数通知
 int intif_parse_AccountReg (int fd)
 {
     int  j, p;
@@ -635,7 +635,7 @@ int intif_parse_AccountReg (int fd)
     return 0;
 }
 
-// ‘qŒÉƒf�[ƒ^Žó�M
+// 倉庫データ�信
 int intif_parse_LoadStorage (int fd)
 {
     struct storage *stor;
@@ -687,7 +687,7 @@ int intif_parse_LoadStorage (int fd)
     return 0;
 }
 
-// ‘qŒÉƒf�[ƒ^‘—�M�¬Œ÷
+// 倉庫データ�信�功
 int intif_parse_SaveStorage (int fd)
 {
     if (battle_config.save_log)
@@ -771,7 +771,7 @@ int intif_parse_SaveGuildStorage (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒB�ì�¬‰Â”Û
+// パーティ作���
 int intif_parse_PartyCreated (int fd)
 {
     if (battle_config.etc_log)
@@ -781,7 +781,7 @@ int intif_parse_PartyCreated (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒB�î•ñ
+// パーティ情報
 int intif_parse_PartyInfo (int fd)
 {
     if (RFIFOW (fd, 2) == 8)
@@ -804,7 +804,7 @@ int intif_parse_PartyInfo (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒB’ljÁ’Ê’m
+// パーティ追加通知
 int intif_parse_PartyMemberAdded (int fd)
 {
     if (battle_config.etc_log)
@@ -814,7 +814,7 @@ int intif_parse_PartyMemberAdded (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒB�Ý’è•Ï�X’Ê’m
+// パーティ設定変更通知
 int intif_parse_PartyOptionChanged (int fd)
 {
     party_optionchanged (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOW (fd, 10),
@@ -822,7 +822,7 @@ int intif_parse_PartyOptionChanged (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒB’E‘Þ’Ê’m
+// パーティ脱退通知
 int intif_parse_PartyMemberLeaved (int fd)
 {
     if (battle_config.etc_log)
@@ -832,14 +832,14 @@ int intif_parse_PartyMemberLeaved (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒB‰ðŽU’Ê’m
+// パーティ解散通知
 int intif_parse_PartyBroken (int fd)
 {
     party_broken (RFIFOL (fd, 2));
     return 0;
 }
 
-// ƒp�[ƒeƒBˆÚ“®’Ê’m
+// パーティ移動通知
 int intif_parse_PartyMove (int fd)
 {
 //  if(battle_config.etc_log)
@@ -849,7 +849,7 @@ int intif_parse_PartyMove (int fd)
     return 0;
 }
 
-// ƒp�[ƒeƒBƒ�ƒbƒZ�[ƒW
+// パーティメッセージ
 int intif_parse_PartyMessage (int fd)
 {
 //  if(battle_config.etc_log)
@@ -859,14 +859,14 @@ int intif_parse_PartyMessage (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒh�ì�¬‰Â”Û
+// ギルド作���
 int intif_parse_GuildCreated (int fd)
 {
     guild_created (RFIFOL (fd, 2), RFIFOL (fd, 6));
     return 0;
 }
 
-// ƒMƒ‹ƒh�î•ñ
+// ギルド情報
 int intif_parse_GuildInfo (int fd)
 {
     if (RFIFOW (fd, 2) == 8)
@@ -890,7 +890,7 @@ int intif_parse_GuildInfo (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo’ljÁ’Ê’m
+// ギルドメン�追加通知
 int intif_parse_GuildMemberAdded (int fd)
 {
     if (battle_config.etc_log)
@@ -901,7 +901,7 @@ int intif_parse_GuildMemberAdded (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo’E‘Þ/’Ç•ú’Ê’m
+// ギルドメン�脱退/追放通知
 int intif_parse_GuildMemberLeaved (int fd)
 {
     guild_member_leaved (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10),
@@ -909,7 +909,7 @@ int intif_parse_GuildMemberLeaved (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒoƒIƒ“ƒ‰ƒCƒ“�ó‘Ô/Lv•Ï�X’Ê’m
+// ギルドメン�オンライン状態/Lv変更通知
 int intif_parse_GuildMemberInfoShort (int fd)
 {
     guild_recv_memberinfoshort (RFIFOL (fd, 2), RFIFOL (fd, 6),
@@ -919,14 +919,14 @@ int intif_parse_GuildMemberInfoShort (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒh‰ðŽU’Ê’m
+// ギルド解散通知
 int intif_parse_GuildBroken (int fd)
 {
     guild_broken (RFIFOL (fd, 2), RFIFOB (fd, 6));
     return 0;
 }
 
-// ƒMƒ‹ƒhŠî–{�î•ñ•Ï�X’Ê’m
+// ギルド基本情報変更通知
 int intif_parse_GuildBasicInfoChanged (int fd)
 {
     int  type = RFIFOW (fd, 8), guild_id = RFIFOL (fd, 4);
@@ -951,7 +951,7 @@ int intif_parse_GuildBasicInfoChanged (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒ�ƒ“ƒo�î•ñ•Ï�X’Ê’m
+// ギルドメン�情報変更通知
 int intif_parse_GuildMemberInfoChanged (int fd)
 {
     int  type = RFIFOW (fd, 16), guild_id = RFIFOL (fd, 4);
@@ -975,7 +975,7 @@ int intif_parse_GuildMemberInfoChanged (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒh–ð�E•Ï�X’Ê’m
+// ギルド役�変更通知
 int intif_parse_GuildPosition (int fd)
 {
     if (RFIFOW (fd, 2) != sizeof (struct guild_position) + 12)
@@ -990,14 +990,14 @@ int intif_parse_GuildPosition (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒhƒXƒLƒ‹Š„‚è�U‚è’Ê’m
+// ギルドスキル割り振り通知
 int intif_parse_GuildSkillUp (int fd)
 {
     guild_skillupack (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10));
     return 0;
 }
 
-// ƒMƒ‹ƒh“¯–¿/“G‘Î’Ê’m
+// ギルド�盟/敵対通知
 int intif_parse_GuildAlliance (int fd)
 {
     guild_allianceack (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10),
@@ -1006,14 +1006,14 @@ int intif_parse_GuildAlliance (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒh��’m•Ï�X’Ê’m
+// ギルド告知変更通知
 int intif_parse_GuildNotice (int fd)
 {
     guild_notice_changed (RFIFOL (fd, 2), RFIFOP (fd, 6), RFIFOP (fd, 66));
     return 0;
 }
 
-// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•Ï�X’Ê’m
+// ギルドエンブレム変更通知
 int intif_parse_GuildEmblem (int fd)
 {
     guild_emblem_changed (RFIFOW (fd, 2) - 12, RFIFOL (fd, 4), RFIFOL (fd, 8),
@@ -1021,7 +1021,7 @@ int intif_parse_GuildEmblem (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒh‰ï˜bŽó�M
+// ギルド会話�信
 int intif_parse_GuildMessage (int fd)
 {
     guild_recv_message (RFIFOL (fd, 4), RFIFOL (fd, 8), RFIFOP (fd, 12),
@@ -1029,21 +1029,21 @@ int intif_parse_GuildMessage (int fd)
     return 0;
 }
 
-// ƒMƒ‹ƒh�éƒf�[ƒ^—v‹�•Ô�M
+// ギルド城データ�求返信
 int intif_parse_GuildCastleDataLoad (int fd)
 {
     return guild_castledataloadack (RFIFOW (fd, 2), RFIFOB (fd, 4),
                                     RFIFOL (fd, 5));
 }
 
-// ƒMƒ‹ƒh�éƒf�[ƒ^•Ï�X’Ê’m
+// ギルド城データ変更通知
 int intif_parse_GuildCastleDataSave (int fd)
 {
     return guild_castledatasaveack (RFIFOW (fd, 2), RFIFOB (fd, 4),
                                     RFIFOL (fd, 5));
 }
 
-// ƒMƒ‹ƒh�éƒf�[ƒ^ˆêŠ‡Žó�M(�‰Šú‰»Žž)
+// ギルド城データ一括�信(�期化時)
 int intif_parse_GuildCastleAllDataLoad (int fd)
 {
     return guild_castlealldataload (RFIFOW (fd, 2),
@@ -1051,14 +1051,14 @@ int intif_parse_GuildCastleAllDataLoad (int fd)
 }
 
 //-----------------------------------------------------------------
-// inter server‚©‚ç‚Ì’Ê�M
-// ƒGƒ‰�[‚ª‚ ‚ê‚Î0(false)‚ð•Ô‚·‚±‚Æ
-// ƒpƒPƒbƒg‚ª�ˆ—�‚Å‚«‚ê‚Î1,ƒpƒPƒbƒg’·‚ª‘«‚è‚È‚¯‚ê‚Î2‚ð•Ô‚·‚±‚Æ
+// inter server�ら�通信
+// エラー��れ�0(false)を返���
+// パケット�処���れ�1,パケット長�足り��れ�2を返���
 int intif_parse (int fd)
 {
     int  packet_len;
     int  cmd = RFIFOW (fd, 0);
-    // ƒpƒPƒbƒg‚ÌIDŠm”F
+    // パケット�ID確�
     if (cmd < 0x3800
         || cmd >=
         0x3800 + (sizeof (packet_len_table) / sizeof (packet_len_table[0]))
@@ -1066,7 +1066,7 @@ int intif_parse (int fd)
     {
         return 0;
     }
-    // ƒpƒPƒbƒg‚Ì’·‚³Šm”F
+    // パケット�長�確�
     packet_len = packet_len_table[cmd - 0x3800];
     if (packet_len == -1)
     {
@@ -1080,7 +1080,7 @@ int intif_parse (int fd)
     {
         return 2;
     }
-    // �ˆ—�•ªŠò
+    // 処�分�
     switch (cmd)
     {
         case 0x3800:
@@ -1195,7 +1195,7 @@ int intif_parse (int fd)
                         RFIFOW (fd, 0));
             return 0;
     }
-    // ƒpƒPƒbƒg“Ç‚Ý”ò‚΂µ
+    // パケット読�飛��
     RFIFOSKIP (fd, packet_len);
     return 1;
 }
-- 
cgit v1.2.3-70-g09d2