nameグローバル変数をplayer_type構造体に編入。 / 'name' global variable moved to structure 'player_type'.

diff --git a/src/birth.c b/src/birth.c
index ec5dd79..5fd0f0f 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -4789,7 +4789,7 @@ static bool get_player_seikaku(void)
        strcpy(tmp, ap_ptr->title);
        strcat(tmp," ");
 #endif
-       strcat(tmp,player_name);
+       strcat(tmp,p_ptr->name);
 
 
        /* Display */
@@ -5768,7 +5768,7 @@ static bool player_birth_aux(void)
 
 
        /* Dump the default name */
-       c_put_str(TERM_L_BLUE, player_name, 1, 34);
+       c_put_str(TERM_L_BLUE, p_ptr->name, 1, 34);
 
 
        /*** Instructions ***/
@@ -6005,8 +6005,8 @@ static bool player_birth_aux(void)
 #else
                if (get_check_strict("Are you sure? ", CHECK_DEFAULT_Y)) break;
 #endif
-               c_put_str(TERM_L_BLUE, player_name, 1, 34);
-               prt("", 1, 34+strlen(player_name));
+               c_put_str(TERM_L_BLUE, p_ptr->name, 1, 34);
+               prt("", 1, 34+strlen(p_ptr->name));
        }
 
        /* Clean up */

diff --git a/src/cmd1.c b/src/cmd1.c
index fc7047c..bf117ed 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -718,9 +718,9 @@ void py_pickup_aux(int o_idx)
 #ifdef JP
        if ((o_ptr->name1 == ART_CRIMSON) && (p_ptr->pseikaku == SEIKAKU_COMBAT))
        {
-               msg_format("こうして、%sは『クリムゾン』を手に入れた。", player_name);
+               msg_format("こうして、%sは『クリムゾン』を手に入れた。", p_ptr->name);
                msg_print("しかし今、『混沌のサーペント』の放ったモンスターが、");
-               msg_format("%sに襲いかかる．．．", player_name);
+               msg_format("%sに襲いかかる．．．", p_ptr->name);
        }
        else
        {

diff --git a/src/cmd4.c b/src/cmd4.c
index 2cde06f..70b407b 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -788,10 +788,10 @@ static void do_cmd_disp_nikki(void)
 
 #ifdef JP
        sprintf(nikki_title, "「%s%s%sの伝説 -%s-」",
-               ap_ptr->title, ap_ptr->no ? "の" : "", player_name, tmp);
+               ap_ptr->title, ap_ptr->no ? "の" : "", p_ptr->name, tmp);
 #else
        sprintf(nikki_title, "Legend of %s %s '%s'",
-               ap_ptr->title, player_name, tmp);
+               ap_ptr->title, p_ptr->name, tmp);
 #endif
 
        /* Display the file contents */

diff --git a/src/externs.h b/src/externs.h
index b840b3e..f7261d5 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -400,7 +400,6 @@ extern s16b target_row;
 extern int player_uid;
 extern int player_euid;
 extern int player_egid;
-extern char player_name[32];
 extern char player_base[32];
 extern char savefile[1024];
 extern char savefile_base[40];

diff --git a/src/files.c b/src/files.c
index f3db609..f1aa05f 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -965,7 +965,7 @@ cptr process_pref_file_expr(char **sp, char *fp)
                        {
                                static char tmp_player_name[32];
                                char *pn, *tpn;
-                               for (pn = player_name, tpn = tmp_player_name; *pn; pn++, tpn++)
+                               for (pn = p_ptr->name, tpn = tmp_player_name; *pn; pn++, tpn++)
                                {
 #ifdef JP
                                        if (iskanji(*pn))
@@ -3438,7 +3438,7 @@ put_str("職業  :", 5, 1);
 #else
                strcat(tmp," ");
 #endif
-       strcat(tmp,player_name);
+       strcat(tmp,p_ptr->name);
 
        c_put_str(TERM_L_BLUE, tmp, 1, 34);
        c_put_str(TERM_L_BLUE, sp_ptr->title, 3, 9);
@@ -3803,9 +3803,9 @@ void display_player(int mode)
        {
                /* Name, Sex, Race, Class */
 #ifdef JP
-               sprintf(tmp, "%s%s%s", ap_ptr->title, ap_ptr->no == 1 ? "の":"", player_name);
+               sprintf(tmp, "%s%s%s", ap_ptr->title, ap_ptr->no == 1 ? "の":"", p_ptr->name);
 #else
-               sprintf(tmp, "%s %s", ap_ptr->title, player_name);
+               sprintf(tmp, "%s %s", ap_ptr->title, p_ptr->name);
 #endif
 
                display_player_one_line(ENTRY_NAME, tmp, TERM_L_BLUE);
@@ -5717,7 +5717,7 @@ bool show_file(bool show_version, cptr name, cptr what, int line, int mode)
                                break;
                        }
 
-                       sprintf(xtmp, "%s: %s", player_name, what ? what : caption);
+                       sprintf(xtmp, "%s: %s", p_ptr->name, what ? what : caption);
                        my_fputs(ffp, xtmp, 80);
                        my_fputs(ffp, "\n", 80);
 
@@ -5790,27 +5790,27 @@ void process_player_name(bool sf)
 
        /* Cannot be too long */
 #if defined(MACINTOSH) || defined(USE_EMX) || defined(ACORN) || defined(VM)
-       if (strlen(player_name) > 15)
+       if (strlen(p_ptr->name) > 15)
        {
                /* Name too long */
-               quit_fmt(_("'%s'という名前は長すぎます！", "The name '%s' is too long!"), player_name);
+               quit_fmt(_("'%s'という名前は長すぎます！", "The name '%s' is too long!"), p_ptr->name);
        }
 #endif
 
        /* Cannot contain "icky" characters */
-       for (i = 0; player_name[i]; i++)
+       for (i = 0; p_ptr->name[i]; i++)
        {
                /* No control characters */
 #ifdef JP
-               if (iskanji(player_name[i])){i++;continue;}
-               if (iscntrl( (unsigned char)player_name[i]))
+               if (iskanji(p_ptr->name[i])){i++;continue;}
+               if (iscntrl( (unsigned char)p_ptr->name[i]))
 #else
-               if (iscntrl(player_name[i]))
+               if (iscntrl(p_ptr->name[i]))
 #endif
 
                {
                        /* Illegal characters */
-                       quit_fmt(_("'%s' という名前は不正なコントロールコードを含んでいます。", "The name '%s' contains control chars!"), player_name);
+                       quit_fmt(_("'%s' という名前は不正なコントロールコードを含んでいます。", "The name '%s' contains control chars!"), p_ptr->name);
                }
        }
 
@@ -5818,12 +5818,12 @@ void process_player_name(bool sf)
 #ifdef MACINTOSH
 
        /* Extract "useful" letters */
-       for (i = 0; player_name[i]; i++)
+       for (i = 0; p_ptr->name[i]; i++)
        {
 #ifdef JP
-               unsigned char c = player_name[i];
+               unsigned char c = p_ptr->name[i];
 #else
-               char c = player_name[i];
+               char c = p_ptr->name[i];
 #endif
 
 
@@ -5837,21 +5837,21 @@ void process_player_name(bool sf)
 #else
 
        /* Extract "useful" letters */
-       for (i = 0; player_name[i]; i++)
+       for (i = 0; p_ptr->name[i]; i++)
        {
 #ifdef JP
-               unsigned char c = player_name[i];
+               unsigned char c = p_ptr->name[i];
 #else
-               char c = player_name[i];
+               char c = p_ptr->name[i];
 #endif
 
                /* Accept some letters */
 #ifdef JP
                if(iskanji(c)){
-                 if(k + 2 >= sizeof(player_base) || !player_name[i+1]) break;
+                 if(k + 2 >= sizeof(player_base) || !p_ptr->name[i+1]) break;
                  player_base[k++] = c;
                  i++;
-                 player_base[k++] = player_name[i];
+                 player_base[k++] = p_ptr->name[i];
                }
 #ifdef SJIS
                else if (iskana(c)) player_base[k++] = c;
@@ -5859,7 +5859,7 @@ void process_player_name(bool sf)
                else
 #endif
                /* Convert path separator to underscore */
-               if (!strncmp(PATH_SEP, player_name+i, strlen(PATH_SEP))){
+               if (!strncmp(PATH_SEP, p_ptr->name+i, strlen(PATH_SEP))){
                        player_base[k++] = '_';
                        i += strlen(PATH_SEP);
                }
@@ -5952,19 +5952,19 @@ void get_name(void)
        char tmp[64];
 
        /* Save the player name */
-       strcpy(tmp, player_name);
+       strcpy(tmp, p_ptr->name);
 
        /* Prompt for a new name */
        if (get_string(_("キャラクターの名前を入力して下さい: ", "Enter a name for your character: "), tmp, 15))
        {
                /* Use the name */
-               strcpy(player_name, tmp);
+               strcpy(p_ptr->name, tmp);
        }
 
-       if (0 == strlen(player_name))
+       if (0 == strlen(p_ptr->name))
        {
                /* Use default name */
-               strcpy(player_name, "PLAYER");
+               strcpy(p_ptr->name, "PLAYER");
        }
 
        strcpy(tmp,ap_ptr->title);
@@ -5974,7 +5974,7 @@ void get_name(void)
 #else
        strcat(tmp, " ");
 #endif
-       strcat(tmp,player_name);
+       strcat(tmp,p_ptr->name);
 
        /* Re-Draw the name (in light blue) */
        Term_erase(34, 1, 255);
@@ -6303,7 +6303,7 @@ static void make_bones(void)
                        if (!fp) return;
 
                        /* Save the info */
-                       fprintf(fp, "%s\n", player_name);
+                       fprintf(fp, "%s\n", p_ptr->name);
                        fprintf(fp, "%d\n", p_ptr->mhp);
                        fprintf(fp, "%d\n", p_ptr->prace);
                        fprintf(fp, "%d\n", p_ptr->pclass);
@@ -6394,7 +6394,7 @@ static void print_tomb(void)
                        p =  player_title[p_ptr->pclass][(p_ptr->lev - 1) / 5];
                }
 
-               center_string(buf, player_name);
+               center_string(buf, p_ptr->name);
                put_str(buf, 6, 11);
 
 #ifndef JP
@@ -6529,7 +6529,7 @@ static void print_tomb(void)
                (void)sprintf(tmp, "%-.24s", ctime(&ct));
                center_string(buf, tmp);
                put_str(buf, 17, 11);
-               msg_format(_("さようなら、%s!", "Goodbye, %s!"), player_name);
+               msg_format(_("さようなら、%s!", "Goodbye, %s!"), p_ptr->name);
        }
 }
 

diff --git a/src/flavor.c b/src/flavor.c
index 1e3b53a..75d6790 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -2020,7 +2020,7 @@ void object_desc(char *buf, object_type *o_ptr, u32b mode)
 #ifdef JP
        if (object_is_smith(o_ptr))
        {
-               t = object_desc_str(t, format("鍛冶師%sの", player_name));
+               t = object_desc_str(t, format("鍛冶師%sの", p_ptr->name));
        }
 
        /* 伝説のアイテム、名のあるアイテムの名前を付加する */
@@ -2186,7 +2186,7 @@ void object_desc(char *buf, object_type *o_ptr, u32b mode)
 #else
        if (object_is_smith(o_ptr))
        {
-               t = object_desc_str(t,format(" of %s the Smith",player_name));
+               t = object_desc_str(t,format(" of %s the Smith",p_ptr->name));
        }
 
        /* Hack -- Append "Artifact" or "Special" names */

diff --git a/src/init1.c b/src/init1.c
index 45f7e9d..37d3132 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -4575,7 +4575,7 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
                        {
                                static char tmp_player_name[32];
                                char *pn, *tpn;
-                               for (pn = player_name, tpn = tmp_player_name; *pn; pn++, tpn++)
+                               for (pn = p_ptr->name, tpn = tmp_player_name; *pn; pn++, tpn++)
                                {
 #ifdef JP
                                        if (iskanji(*pn))

diff --git a/src/load.c b/src/load.c
index 65e58dd..513abb9 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1623,7 +1623,7 @@ static void rd_extra(void)
        s16b tmp16s;
        u16b tmp16u;
 
-       rd_string(player_name, sizeof(player_name));
+       rd_string(p_ptr->name, sizeof(p_ptr->name));
 
        rd_string(p_ptr->died_from, sizeof(p_ptr->died_from));
 

diff --git a/src/main.c b/src/main.c
index 728c490..d8e1aa1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
 
        /* Acquire the "user name" as a default player name */
 #ifdef ANGBAND_2_8_1
-       user_name(player_name, player_uid);
+       user_name(p_ptr->name, player_uid);
 #else /* ANGBAND_2_8_1 */
        user_name(op_ptr->full_name, player_uid);
 #endif /* ANGBAND_2_8_1 */
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
                        {
                                if (!argv[i][2]) goto usage;
 #ifdef ANGBAND_2_8_1
-                               strcpy(player_name, &argv[i][2]);
+                               strcpy(p_ptr->name, &argv[i][2]);
 #else /* ANGBAND_2_8_1 */
 
                                /* Get the savefile name */

diff --git a/src/report.c b/src/report.c
index c3eaa3c..7517652 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -452,7 +452,7 @@ errr report_score(void)
        sprintf(seikakutmp, "%s ", ap_ptr->title);
 #endif
 
-       buf_sprintf(score, "name: %s\n", player_name);
+       buf_sprintf(score, "name: %s\n", p_ptr->name);
 #ifdef JP
        buf_sprintf(score, "version: 変愚蛮怒 %d.%d.%d\n",
                    FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);

diff --git a/src/save.c b/src/save.c
index 81f7887..e46deff 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -605,7 +605,7 @@ static void wr_extra(void)
        int i,j;
        byte tmp8u;
 
-       wr_string(player_name);
+       wr_string(p_ptr->name);
 
        wr_string(p_ptr->died_from);
 

diff --git a/src/scores.c b/src/scores.c
index 88bb981..ba25c73 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -499,7 +499,7 @@ errr top_twenty(void)
 #endif
 
        /* Save the player name (15 chars) */
-       sprintf(the_score.who, "%-.15s", player_name);
+       sprintf(the_score.who, "%-.15s", p_ptr->name);
 
        /* Save the player info XXX XXX XXX */
        sprintf(the_score.uid, "%7u", player_uid);
@@ -612,7 +612,7 @@ errr predict_score(void)
        strcpy(the_score.day, _("今日", "TODAY"));
 
        /* Save the player name (15 chars) */
-       sprintf(the_score.who, "%-.15s", player_name);
+       sprintf(the_score.who, "%-.15s", p_ptr->name);
 
        /* Save the player info XXX XXX XXX */
        sprintf(the_score.uid, "%7u", player_uid);
@@ -712,10 +712,10 @@ void show_highclass(void)
 
 #ifdef JP
        sprintf(out_val, "あなた) %sの%s (レベル %2d)",
-           race_info[p_ptr->prace].title,player_name, p_ptr->lev);
+           race_info[p_ptr->prace].title,p_ptr->name, p_ptr->lev);
 #else
        sprintf(out_val, "You) %s the %s (Level %2d)",
-           player_name, race_info[p_ptr->prace].title, p_ptr->lev);
+           p_ptr->name, race_info[p_ptr->prace].title, p_ptr->lev);
 #endif
 
        prt(out_val, (m + 8), 0);
@@ -803,10 +803,10 @@ void race_score(int race_num)
        {
 #ifdef JP
        sprintf(out_val, "あなた) %sの%s (レベル %2d)",
-                    race_info[p_ptr->prace].title,player_name, p_ptr->lev);
+                    race_info[p_ptr->prace].title,p_ptr->name, p_ptr->lev);
 #else
                sprintf(out_val, "You) %s the %s (Level %3d)",
-                   player_name, race_info[p_ptr->prace].title, p_ptr->lev);
+                   p_ptr->name, race_info[p_ptr->prace].title, p_ptr->lev);
 #endif
 
                prt(out_val, (m + 8), 0);

diff --git a/src/spells3.c b/src/spells3.c
index cc606ef..f7fcda1 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -445,7 +445,7 @@ bool teleport_player_aux(int dis, u32b mode)
 
 #ifdef JP
        if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
-               msg_format("『こっちだぁ、%s』", player_name);
+               msg_format("『こっちだぁ、%s』", p_ptr->name);
 #endif
 
        /* Move the player */

diff --git a/src/types.h b/src/types.h
index 529fbb6..1c1db1d 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1345,7 +1345,7 @@ struct player_type
 
        int y;  /* Player location in dungeon */
        int x;  /* Player location in dungeon */
-
+       char name[32]; /* Current player's character name */
 };
 
 

diff --git a/src/variable.c b/src/variable.c
index 7712f36..623b1f1 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -401,11 +401,6 @@ int player_euid;
 int player_egid;
 
 /*
- * Current player's character name
- */
-char player_name[32];
-
-/*
  * Stripped version of "player_name"
  */
 char player_base[32];