Fix processing starting armor and weapon

1 files changed, 37 insertions, 37 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 63a84fd..fefc420 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -442,7 +442,7 @@ int mmo_char_fromstr (char *str, struct mmo_charstatus *p)
     }
 
     if (str[next] == '\n' || str[next] == '\r')
-        return 1;               // �V�K�f�[�^
+        return 1;               // �V�K�f�[�^
 
     next++;
 
@@ -557,7 +557,7 @@ int mmo_char_fromstr (char *str, struct mmo_charstatus *p)
     for (i = 0;
          str[next] && str[next] != '\t' && str[next] != '\n'
          && str[next] != '\r'; i++)
-    {                           // global_reg�����ȑO��athena.txt�݊��̂��߈ꉞ'\n'�`�F�b�N
+    {                           // global_reg����ȑO��athena.txt�݊��̂��߈ꉞ'\n'�`�F�b�N
         if (sscanf
             (str + next, "%[^,],%d%n", p->global_reg[i].str,
              &p->global_reg[i].value, &len) != 2)
@@ -1845,17 +1845,17 @@ int disconnect_player (int accound_id)
     return 0;
 }
 
-// �L�����폜�ɔ����f�[�^�폜
+// �L�����폜�ɔ����f�[�^�폜
 static int char_delete (struct mmo_charstatus *cs)
 {
 
-    // �M���h�E��
+    // �M���h�E��
     if (cs->guild_id)
         inter_guild_leave (cs->guild_id, cs->account_id, cs->char_id);
-    // �p�[�e�B�[�E��
+    // �p�[�e�B�[�E��
     if (cs->party_id)
         inter_party_leave (cs->party_id, cs->account_id);
-    // ����
+    // ����
     if (cs->partner_id)
         char_divorce (cs);
 
@@ -2157,7 +2157,7 @@ int parse_tologin (int fd)
                 RFIFOSKIP (fd, 8 + RFIFOL (fd, 4));
                 break;
 
-                // account_reg2�ύX�ʒm
+                // account_reg2�ύX�ʒm
             case 0x2729:
                 if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2))
                     return 0;
@@ -2174,7 +2174,7 @@ int parse_tologin (int fd)
                         reg[j].value = RFIFOL (fd, p + 32);
                     }
                     set_account_reg2 (acc, j, reg);
-                    // ���C���O�C�����֎~���Ă���Α���K�v�͖���
+                    // ���C���O�C�����֎~���Ă����Α����K�v�͖���
                     memcpy (buf, RFIFOP (fd, 0), RFIFOW (fd, 2));
                     WBUFW (buf, 0) = 0x2b11;
                     mapif_sendall (buf, WBUFW (buf, 2));
@@ -2522,7 +2522,7 @@ int parse_frommap (int fd)
                 RFIFOSKIP (fd, RFIFOW (fd, 2));
                 break;
 
-                // �F�ؗv��
+                // �F�ؗv��
             case 0x2afc:
                 if (RFIFOREST (fd) < 22)
                     return 0;
@@ -2572,7 +2572,7 @@ int parse_frommap (int fd)
                 RFIFOSKIP (fd, 22);
                 break;
 
-                // MAP�T�[�o�[��̃��[�U�[����M
+                // MAP�T�[�o�[���̃��[�U�[�����M
             case 0x2aff:
                 if (RFIFOREST (fd) < 6 || RFIFOREST (fd) < RFIFOW (fd, 2))
                     return 0;
@@ -2604,7 +2604,7 @@ int parse_frommap (int fd)
                 RFIFOSKIP (fd, 6 + i * 4);
                 break;
 
-                // �L�����f�[�^�ۑ�
+                // �L�����f�[�^�ۑ�
             case 0x2b01:
                 if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2))
                     return 0;
@@ -2620,7 +2620,7 @@ int parse_frommap (int fd)
                 RFIFOSKIP (fd, RFIFOW (fd, 2));
                 break;
 
-                // �L�����Z���v��
+                // �L�����Z���v��
             case 0x2b02:
                 if (RFIFOREST (fd) < 18)
                     return 0;
@@ -2643,7 +2643,7 @@ int parse_frommap (int fd)
                 RFIFOSKIP (fd, 18);
                 break;
 
-                // �}�b�v�T�[�o�[�Ԉړ��v��
+                // �}�b�v�T�[�o�[�Ԉړ��v��
             case 0x2b05:
                 if (RFIFOREST (fd) < 49)
                     return 0;
@@ -2675,7 +2675,7 @@ int parse_frommap (int fd)
                 RFIFOSKIP (fd, 49);
                 break;
 
-                // �L����������
+                // �L����������
             case 0x2b08:
                 if (RFIFOREST (fd) < 6)
                     return 0;
@@ -2868,7 +2868,7 @@ int parse_frommap (int fd)
 
 //      case 0x2b0f: not more used (available for futur usage)
 
-                // account_reg�ۑ��v��
+                // account_reg�ۑ��v��
             case 0x2b10:
                 if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2))
                     return 0;
@@ -2884,7 +2884,7 @@ int parse_frommap (int fd)
                         reg[j].value = RFIFOL (fd, p + 32);
                     }
                     set_account_reg2 (acc, j, reg);
-                    // login�T�[�o�[�֑���
+                    // login�T�[�o�[�֑���
                     if (login_fd > 0)
                     {           // don't send request if no login-server
                         WFIFOW (login_fd, 0) = 0x2728;
@@ -2892,7 +2892,7 @@ int parse_frommap (int fd)
                                 RFIFOW (fd, 2));
                         WFIFOSET (login_fd, WFIFOW (login_fd, 2));
                     }
-                    // ���[���h�ւ̓��C���O�C�����Ȃ����map�T�[�o�[�ɑ���K�v�͂Ȃ�
+                    // ���[���h�ւ̓��C���O�C�����Ȃ�����map�T�[�o�[�ɑ����K�v�͂Ȃ�
                     //memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2));
                     //WBUFW(buf,0) = 0x2b11;
                     //mapif_sendall(buf, WBUFW(buf,2));
@@ -2919,15 +2919,15 @@ int parse_frommap (int fd)
                 }
 
             default:
-                // inter server�����ɓn��
+                // inter server�����ɓn��
             {
                 int  r = inter_parse_frommap (fd);
-                if (r == 1)     // �����ł���
+                if (r == 1)     // �����ł���
                     break;
-                if (r == 2)     // �p�P�b�g��������Ȃ�
+                if (r == 2)     // �p�P�b�g���������Ȃ�
                     return 0;
             }
-                // inter server�����ł��Ȃ��ꍇ�͐ؒf
+                // inter server�����ł��Ȃ��ꍇ�͐ؒf
                 printf
                     ("char: unknown packet 0x%04x (%d bytes to read in buffer)! (from map).\n",
                      RFIFOW (fd, 0), RFIFOREST (fd));
@@ -2965,7 +2965,7 @@ int search_mapserver (char *map)
     return -1;
 }
 
-// char_mapif�̏����������i���݂�inter_mapif�������̂݁j
+// char_mapif�̏����������i���݂�inter_mapif�������̂݁j
 static int char_mapif_init (int fd)
 {
     return inter_mapif_init (fd);
@@ -3021,7 +3021,7 @@ int parse_char (int fd)
 
         switch (RFIFOW (fd, 0))
         {
-            case 0x20b:        //20040622�Í���ragexe�Ή�
+            case 0x20b:        //20040622�Í���ragexe�Ή�
                 if (RFIFOREST (fd) < 19)
                     return 0;
                 RFIFOSKIP (fd, 19);
@@ -3040,7 +3040,7 @@ int parse_char (int fd)
                 RFIFOSKIP (fd, 50);
                 break;
 
-            case 0x65:         // �ڑ��v��
+            case 0x65:         // �ڑ��v��
                 if (RFIFOREST (fd) < 17)
                     return 0;
                 {
@@ -3133,7 +3133,7 @@ int parse_char (int fd)
                 RFIFOSKIP (fd, 17);
                 break;
 
-            case 0x66:         // �L�����I��
+            case 0x66:         // �L�����I��
                 if (!sd || RFIFOREST (fd) < 3)
                     return 0;
 
@@ -3297,7 +3297,7 @@ int parse_char (int fd)
                 RFIFOSKIP (fd, 3);
                 break;
 
-            case 0x67:         // �쐬
+            case 0x67:         // �쐬
                 if (!sd || RFIFOREST (fd) < 37)
                     return 0;
                 i = make_new_char (fd, RFIFOP (fd, 2));
@@ -3498,7 +3498,7 @@ int parse_char (int fd)
                 }
                 break;
 
-            case 0x2af8:       // �}�b�v�T�[�o�[���O�C��
+            case 0x2af8:       // �}�b�v�T�[�o�[���O�C��
                 if (RFIFOREST (fd) < 60)
                     return 0;
                 WFIFOW (fd, 0) = 0x2af9;
@@ -3547,13 +3547,13 @@ int parse_char (int fd)
                 }
                 break;
 
-            case 0x187:        // Alive�M���H
+            case 0x187:        // Alive�M���H
                 if (RFIFOREST (fd) < 6)
                     return 0;
                 RFIFOSKIP (fd, 6);
                 break;
 
-            case 0x7530:       // Athena��񏊓�
+            case 0x7530:       // Athena���񏊓�
                 WFIFOW (fd, 0) = 0x7531;
                 WFIFOB (fd, 2) = ATHENA_MAJOR_VERSION;
                 WFIFOB (fd, 3) = ATHENA_MINOR_VERSION;
@@ -3566,7 +3566,7 @@ int parse_char (int fd)
                 RFIFOSKIP (fd, 2);
                 return 0;
 
-            case 0x7532:       // �ڑ��̐ؒf(default�Ə����͈ꏏ���������I�ɂ��邽��)
+            case 0x7532:       // �ڑ��̐ؒf(default�Ə����͈ꏏ���������I�ɂ��邽��)
                 session[fd]->eof = 1;
                 return 0;
 
@@ -3579,7 +3579,7 @@ int parse_char (int fd)
     return 0;
 }
 
-// �S�Ă�MAP�T�[�o�[�Ƀf�[�^���M�i���M����map�I�̐���Ԃ��j
+// �S�Ă�MAP�T�[�o�[�Ƀf�[�^���M�i���M����map�I�̐����Ԃ��j
 int mapif_sendall (char *buf, unsigned int len)
 {
     int  i, c;
@@ -3598,7 +3598,7 @@ int mapif_sendall (char *buf, unsigned int len)
     return c;
 }
 
-// �����ȊO�̑S�Ă�MAP�T�[�o�[�Ƀf�[�^���M�i���M����map�I�̐���Ԃ��j
+// �����ȊO�̑S�Ă�MAP�T�[�o�[�Ƀf�[�^���M�i���M����map�I�̐����Ԃ��j
 int mapif_sendallwos (int sfd, unsigned char *buf, unsigned int len)
 {
     int  i, c;
@@ -3617,7 +3617,7 @@ int mapif_sendallwos (int sfd, unsigned char *buf, unsigned int len)
     return c;
 }
 
-// MAP�T�[�o�[�Ƀf�[�^���M�imap�I�����m�F�L��j
+// MAP�T�[�o�[�Ƀf�[�^���M�imap�I�����m�F�L���j
 int mapif_send (int fd, unsigned char *buf, unsigned int len)
 {
     int  i;
@@ -3689,7 +3689,7 @@ int check_connect_login_server (int tid, unsigned int tick, int id, int data)
 
 //----------------------------------------------------------
 // Return numerical value of a switch configuration by [Yor]
-// on/off, english, fran�ais, deutsch, espanol
+// on/off, english, fran�ais, deutsch, espanol
 //----------------------------------------------------------
 int config_switch (const char *str)
 {
@@ -3976,13 +3976,13 @@ int char_config_read (const char *cfgName)
         }
         else if (strcmpi (w1, "start_weapon") == 0)
         {
-            start_zeny = atoi (w2);
+            start_weapon = atoi (w2);
             if (start_weapon < 0)
                 start_weapon = 0;
         }
         else if (strcmpi (w1, "start_armor") == 0)
         {
-            start_zeny = atoi (w2);
+            start_armor = atoi (w2);
             if (start_armor < 0)
                 start_armor = 0;
         }
@@ -4105,7 +4105,7 @@ int do_init (int argc, char **argv)
     update_online = time (NULL);
     create_online_files ();     // update online players files at start of the server
 
-    inter_init ((argc > 2) ? argv[2] : inter_cfgName);  // inter server ������
+    inter_init ((argc > 2) ? argv[2] : inter_cfgName);  // inter server ������
 
     set_termfunc (do_final);
     set_defaultparse (parse_char);