[Refactor] #37353 型の置換。 / Type replacement.

diff --git a/src/cmd4.c b/src/cmd4.c
index 88c44f2..c439370 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -491,7 +491,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                }
                case NIKKI_RAND_QUEST_C:
                {
-                       char name[MAX_NLEN];
+                       GAME_TEXT name[MAX_NLEN];
                        strcpy(name, r_name+r_info[quest[num].r_idx].name);
                        fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)を達成した。\n",
                                                   " %2d:%02d %20s completed random quest '%s'\n"), hour, min, note_level, name);
@@ -499,7 +499,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                }
                case NIKKI_RAND_QUEST_F:
                {
-                       char name[MAX_NLEN];
+                       GAME_TEXT name[MAX_NLEN];
                        strcpy(name, r_name+r_info[quest[num].r_idx].name);
                        fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)から逃げ出した。\n",
                                                   " %2d:%02d %20s ran away from quest '%s'.\n"), hour, min, note_level, name);
@@ -7748,7 +7748,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 {
        char tmp_str[120];
        char rand_tmp_str[120] = "\0";
-       char name[MAX_NLEN];
+       GAME_TEXT name[MAX_NLEN];
        monster_race *r_ptr;
        IDX i;
        int rand_level = 100;

diff --git a/src/monster1.c b/src/monster1.c
index 78b8117..1cb3736 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -750,11 +750,10 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
                                        else
                                        {
 #ifdef JP
-                                               hooked_roff(format("、 %dd%d 体の%s", r_ptr->reinforce_dd[n], r_ptr->reinforce_ds[n],
-                                                       r_name + rf_ptr->name));
+                                               hooked_roff(format("、 %dd%d 体の%s", r_ptr->reinforce_dd[n], r_ptr->reinforce_ds[n], r_name + rf_ptr->name));
 #else
                                                bool plural = (r_ptr->reinforce_dd[n] * r_ptr->reinforce_ds[n] > 1);
-                                               char name[MAX_NLEN];
+                                               GAME_TEXT name[MAX_NLEN];
                                                strcpy(name, r_name + rf_ptr->name);
                                                if(plural) plural_aux(name);
                                                hooked_roff(format(",%dd%d %s", r_ptr->reinforce_dd[n], r_ptr->reinforce_ds[n], name));

diff --git a/src/racial.c b/src/racial.c
index 959187b..df571b0 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -579,7 +579,7 @@ typedef struct power_desc_type power_desc_type;
  */
 struct power_desc_type
 {
-       char name[MAX_NLEN];      //!<レイシャル名
+       GAME_TEXT name[MAX_NLEN];      //!<レイシャル名
        PLAYER_LEVEL level;     //!<体得レベル
        int cost;
        int stat;

diff --git a/src/spells3.c b/src/spells3.c
index 2d7be87..e62ee3d 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -3341,7 +3341,7 @@ void display_spell_list(void)
        TERM_LEN y, x;
        int m[9];
        const magic_type *s_ptr;
-       char name[MAX_NLEN];
+       GAME_TEXT name[MAX_NLEN];
        char out_val[160];
 
 

diff --git a/src/types.h b/src/types.h
index 5d96f9f..b1f9be7 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -698,7 +698,7 @@ struct quest_type
        QUEST_STATUS status;          /*!< クエストの進行ステータス / Is the quest taken, completed, finished? */
        QUEST_TYPE type;              /*!< クエストの種別 / The quest type */
 
-       char name[60];          /*!< クエスト名 / Quest name */
+       GAME_TEXT name[60];          /*!< クエスト名 / Quest name */
        DEPTH level;            /*!< 処理階層 / Dungeon level */
        MONRACE_IDX r_idx;      /*!< クエスト対象のモンスターID / Monster race */
 
@@ -724,16 +724,11 @@ typedef struct owner_type owner_type;
 struct owner_type
 {
        cptr owner_name;        /* Name */
-
        PRICE max_cost;         /* Purse limit */
-
        byte max_inflate;       /* Inflation (max) */
        byte min_inflate;       /* Inflation (min) */
-
        byte haggle_per;        /* Haggle unit */
-
        byte insult_max;        /* Insult limit */
-
        byte owner_race;        /* Owner race */
 };
 
@@ -1357,7 +1352,7 @@ struct player_type
 
        POSITION y;     /* Player location in dungeon */
        POSITION x;     /* Player location in dungeon */
-       char name[32]; /*!< 現在のプレイヤー名 / Current player's character name */
+       GAME_TEXT name[32]; /*!< 現在のプレイヤー名 / Current player's character name */
 };
 
 
@@ -1458,7 +1453,7 @@ typedef struct building_type building_type;
 
 struct building_type
 {
-       char name[20];                  /* proprietor name */
+       GAME_TEXT name[20];                  /* proprietor name */
        GAME_TEXT owner_name[20];            /* proprietor name */
        char owner_race[20];            /* proprietor race */
 
@@ -1497,12 +1492,12 @@ struct border_type
 typedef struct wilderness_type wilderness_type;
 struct wilderness_type
 {
-       int         terrain;
-       int         town;
-       int         road;
-       u32b        seed;
-       DEPTH        level;
-       byte        entrance;
+       int terrain;
+       int town;
+       int road;
+       u32b seed;
+       DEPTH level;
+       byte entrance;
 };
 
 
@@ -1513,10 +1508,10 @@ struct wilderness_type
 typedef struct town_type town_type;
 struct town_type
 {
-       char        name[32];
-       u32b        seed;      /* Seed for RNG */
-       store_type      *store;    /* The stores [MAX_STORES] */
-       byte        numstores;
+       GAME_TEXT name[32];
+       u32b seed;      /* Seed for RNG */
+       store_type *store;    /* The stores [MAX_STORES] */
+       byte numstores;
 };
 
 /* Dungeons */