OSDN Git Service

[Refactor] #38836 GAME_TEXT 型定義。 / Typedef GAME_TEXT.
authorDeskull <deskull@users.sourceforge.jp>
Fri, 4 Jan 2019 01:33:42 +0000 (10:33 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Fri, 4 Jan 2019 01:56:16 +0000 (10:56 +0900)
48 files changed:
src/artifact.c
src/autopick.c
src/avatar.c
src/bldg.c
src/chuukei.c
src/cmd-activate.c
src/cmd-eat.c
src/cmd-item.c
src/cmd-pet.c
src/cmd-read.c
src/cmd1.c
src/cmd2.c
src/cmd4.c
src/dungeon.c
src/files.c
src/floor-save.c
src/floor-streams.c
src/h-type.h
src/main-win.c
src/mane.c
src/melee1.c
src/mind.c
src/monster-process.c
src/monster-status.c
src/monster1.c
src/monster2.c
src/mspells1.c
src/mspells2.c
src/mspells3.c
src/mspells4.c
src/mutation.c
src/object-curse.c
src/object1.c
src/object2.c
src/player-damage.c
src/racial.c
src/realm-hex.c
src/realm-hissatsu.c
src/report.c
src/selfinfo.c
src/shoot.c
src/spells1.c
src/spells2.c
src/spells3.c
src/store.c
src/types.h
src/wizard2.c
src/xtra2.c

index e4a7a65..a7f4880 100644 (file)
@@ -1743,7 +1743,7 @@ static void get_random_name(object_type *o_ptr, char *return_name, bool armour,
  */
 bool create_artifact(object_type *o_ptr, bool a_scroll)
 {
-       char    new_name[1024];
+       GAME_TEXT new_name[1024];
        PARAMETER_VALUE has_pval = 0;
        int     powers = randint1(5) + 1;
        int     max_powers;
@@ -2027,7 +2027,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
 
        if (a_scroll)
        {
-               char dummy_name[80] = "";
+               GAME_TEXT dummy_name[80] = "";
                cptr ask_msg = _("このアーティファクトを何と名付けますか?", "What do you want to call the artifact? ");
 
                /* Identify it fully */
index 685c7c3..9b2daf6 100644 (file)
@@ -134,7 +134,7 @@ static char KEY_COLLECTING[] = "collecting";
 static char KEY_ARTIFACT[] = "artifact";
 static char KEY_EGO[] = "ego";
 static char KEY_GOOD[] = "good";
-static char KEY_NAMELESS[] = "nameless";
+static GAME_TEXT KEY_nameLESS[] = "nameless";
 static char KEY_AVERAGE[] = "average";
 static char KEY_WORTHLESS[] = "worthless";
 static char KEY_RARE[] = "rare";
@@ -664,7 +664,7 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr)
        /* Prepare the object description */
        if (name)
        {
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
 
                object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL | OD_NAME_ONLY));
 
@@ -1436,7 +1436,7 @@ static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, cptr o_nam
 int is_autopick(object_type *o_ptr)
 {
        int i;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        if (o_ptr->tval == TV_GOLD) return -1;
 
@@ -1582,7 +1582,7 @@ static void auto_destroy_item(object_type *o_ptr, int autopick_idx)
        /* Artifact? */
        if (!can_player_destroy_object(o_ptr))
        {
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
 
                /* Describe the object (with {terrible/special}) */
                object_desc(o_name, o_ptr, 0);
@@ -1618,7 +1618,7 @@ static void autopick_delayed_alter_aux(INVENTORY_IDX item)
 
        if (o_ptr->k_idx && (o_ptr->marked & OM_AUTODESTROY))
        {
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
 
                /* Describe the object (with {terrible/special}) */
                object_desc(o_name, o_ptr, 0);
@@ -1723,7 +1723,7 @@ void autopick_pickup_items(cave_type *c_ptr)
 
                        if (!inven_carry_okay(o_ptr))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, o_ptr, 0);
 
@@ -1736,7 +1736,7 @@ void autopick_pickup_items(cave_type *c_ptr)
                        else if (autopick_list[idx].action & DO_QUERY_AUTOPICK)
                        {
                                char out_val[MAX_NLEN+20];
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                if (o_ptr->marked & OM_NO_QUERY)
                                {
@@ -1923,7 +1923,7 @@ bool autopick_autoregister(object_type *o_ptr)
            ((o_ptr->ident & IDENT_SENSE) &&
             (o_ptr->feeling == FEEL_TERRIBLE || o_ptr->feeling == FEEL_SPECIAL)))
        {
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
 
                /* Describe the object (with {terrible/special}) */
                object_desc(o_name, o_ptr, 0);
@@ -3589,7 +3589,7 @@ static byte get_string_for_search(object_type **o_handle, cptr *search_strp)
 static void search_for_object(text_body_type *tb, object_type *o_ptr, bool forward)
 {
        autopick_type an_entry, *entry = &an_entry;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        int bypassed_cy = -1;
 
        /* Start searching from current cursor position */
index f9c95e1..51eae4b 100644 (file)
@@ -490,7 +490,7 @@ void dump_virtues(FILE *OutFile)
 
        for (v_nr = 0; v_nr < 8; v_nr++)
        {
-               char vir_name [20];
+               GAME_TEXT vir_name [20];
                int tester = p_ptr->virtues[v_nr];
 
                strcpy(vir_name, virtue[(p_ptr->vir_types[v_nr])-1]);
index cd537cf..af8d2ef 100644 (file)
@@ -1732,7 +1732,7 @@ static bool kankin(void)
        INVENTORY_IDX i;
        int j;
        bool change = FALSE;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        object_type *o_ptr;
 
        /* Loop for inventory and right/left arm */
@@ -2655,7 +2655,7 @@ static void compare_weapon_aux(object_type *o_ptr, int col, int r)
  */
 static void list_weapon(object_type *o_ptr, TERM_LEN row, TERM_LEN col)
 {
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char tmp_str[80];
 
        DICE_NUMBER eff_dd = o_ptr->dd + p_ptr->to_dd[0];
index e6b29e0..445268f 100644 (file)
@@ -52,7 +52,7 @@ static int browse_delay; /* 表示するまでの時間(100ms単位)(この間
 static int sd; /* ソケットのファイルディスクリプタ */
 static long time_diff;   /* プレイ側との時間のずれ(これを見ながらディレイを調整していく) */
 static int server_port;
-static char server_name[MAX_HOSTNAME];
+static GAME_TEXT server_name[MAX_HOSTNAME];
 #endif
 
 static int movie_fd;
index 9908331..24d7b86 100644 (file)
@@ -1544,7 +1544,7 @@ bool activate_artifact(object_type *o_ptr)
                INVENTORY_IDX inv;
                int t;
                OBJECT_IDX o_idx;
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
                object_type forge;
 
                /* Cast off activated item */
@@ -1632,7 +1632,7 @@ bool activate_artifact(object_type *o_ptr)
                }
                else if (cave[y][x].m_idx)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
                        msg_format(_("%sが邪魔だ!", "%^s is stand in your way."), m_name);
                        p_ptr->energy_use = 0;
index 4358cc6..4e3883c 100644 (file)
@@ -416,7 +416,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
                        my_strchr("pht", r_info[o_ptr->pval].d_char)))\r
        {\r
                /* Drain vitality of humanoids */\r
-               char o_name[MAX_NLEN];\r
+               GAME_TEXT o_name[MAX_NLEN];\r
                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));\r
                msg_format(_("%sは燃え上り灰になった。精力を吸収した気がする。", "%^s is burnt to ashes.  You absorb its vitality!"), o_name);\r
                (void)set_food(PY_FOOD_MAX - 1);\r
index 63b4981..cccad69 100644 (file)
@@ -160,7 +160,7 @@ void do_cmd_wield(void)
        cptr act;
        cptr q, s;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
 
        OBJECT_IDX need_switch_wielding = 0;
@@ -324,7 +324,7 @@ void do_cmd_wield(void)
                object_type *switch_o_ptr = &inventory[need_switch_wielding];
                object_type object_tmp;
                object_type *otmp_ptr = &object_tmp;
-               char switch_name[MAX_NLEN];
+               GAME_TEXT switch_name[MAX_NLEN];
 
                object_desc(switch_name, switch_o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
@@ -468,7 +468,7 @@ void do_cmd_wield(void)
 void kamaenaoshi(INVENTORY_IDX item)
 {
        object_type *o_ptr, *new_o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        if (item == INVEN_RARM)
        {
@@ -710,7 +710,7 @@ void do_cmd_destroy(void)
        object_type forge;
        object_type *q_ptr = &forge;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char out_val[MAX_NLEN+40];
 
        cptr q, s;
@@ -912,7 +912,7 @@ void do_cmd_observe(void)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr q, s;
 
 
@@ -1011,7 +1011,7 @@ void do_cmd_inscribe(void)
 {
        OBJECT_IDX item;
        object_type             *o_ptr;
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char            out_val[80];
        cptr q, s;
 
index c409c93..47555f8 100644 (file)
@@ -196,7 +196,7 @@ void do_cmd_pet_dismiss(void)
        for (i = 0; i < max_pet; i++)
        {
                bool delete_this;
-               char friend_name[80];
+               GAME_TEXT friend_name[80];
                bool kakunin;
 
                /* Access the monster */
@@ -253,7 +253,7 @@ void do_cmd_pet_dismiss(void)
                {
                        if (record_named_pet && m_ptr->nickname)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
 
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
@@ -396,7 +396,7 @@ bool do_riding(bool force)
 
                if (MON_CSLEEP(m_ptr))
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, 0);
                        (void)set_monster_csleep(c_ptr->m_idx, 0);
                        msg_format(_("%sを起こした。", "You have waked %s up."), m_name);
@@ -432,7 +432,7 @@ static void do_name_pet(void)
 {
        monster_type *m_ptr;
        char out_val[20];
-       char m_name[80];
+       GAME_TEXT m_name[80];
        bool old_name = FALSE;
        bool old_target_pet = target_pet;
 
@@ -1041,7 +1041,7 @@ bool rakuba(HIT_POINT dam, bool force)
 {
        int i, y, x, oy, ox;
        int sn = 0, sy = 0, sx = 0;
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_type *m_ptr = &m_list[p_ptr->riding];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
        bool fall_dam = FALSE;
index 631dae4..24c4fd4 100644 (file)
@@ -532,7 +532,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
        else if (o_ptr->tval==TV_PARCHMENT)\r
        {\r
                cptr q;\r
-               char o_name[MAX_NLEN];\r
+               GAME_TEXT o_name[MAX_NLEN];\r
                char buf[1024];\r
                screen_save();\r
 \r
index a8f28f9..61c5ba2 100644 (file)
@@ -459,12 +459,12 @@ void py_pickup_aux(OBJECT_IDX o_idx)
        INVENTORY_IDX slot;
 
 #ifdef JP
-       char o_name[MAX_NLEN];
-       char old_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
+       GAME_TEXT old_name[MAX_NLEN];
        char kazu_str[80];
        int hirottakazu;
 #else
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 #endif
 
        object_type *o_ptr;
@@ -547,7 +547,7 @@ void carry(bool pickup)
 
        OBJECT_IDX this_o_idx, next_o_idx = 0;
 
-       char    o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Recenter the map around the player */
        verify_panel();
@@ -1110,7 +1110,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
        monster_type *riding_m_ptr = &m_list[p_ptr->riding];
        monster_race *riding_r_ptr = &r_info[p_ptr->riding ? riding_m_ptr->r_idx : 0]; /* Paranoia */
 
-       char m_name[80];
+       GAME_TEXT m_name[80];
 
        bool p_can_enter = player_can_enter(c_ptr->feat, CEM_P_CAN_ENTER_PATTERN);
        bool p_can_kill_walls = FALSE;
@@ -1283,7 +1283,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                }
                else if (MON_MONFEAR(riding_m_ptr))
                {
-                       char steed_name[80];
+                       GAME_TEXT steed_name[80];
                        monster_desc(steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name);
                        oktomove = FALSE;
@@ -1328,7 +1328,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
 
                if (oktomove && MON_STUNNED(riding_m_ptr) && one_in_(2))
                {
-                       char steed_name[80];
+                       GAME_TEXT steed_name[80];
                        monster_desc(steed_name, riding_m_ptr, 0);
                        msg_format(_("%sが朦朧としていてうまく動けない!", "You cannot control stunned %s!"), steed_name);
                        oktomove = FALSE;
index 20c8013..8c86849 100644 (file)
@@ -2619,7 +2619,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 
        bool hit_body = FALSE;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        u16b path_g[512];       /* For calcuration of path length */
 
@@ -2926,7 +2926,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                /* Handle visible monster */
                                else
                                {
-                                       char m_name[80];
+                                       GAME_TEXT m_name[80];
 
                                        /* Get "the monster" or "it" */
                                        monster_desc(m_name, m_ptr, 0);
@@ -2948,7 +2948,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                        if ((randint1(randint1(r_ptr->level / (3 + p_ptr->concent)) + (8 - p_ptr->concent)) == 1)
                                                && !(r_ptr->flags1 & RF1_UNIQUE) && !(r_ptr->flags7 & RF7_UNIQUE2))
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
 
                                                /* Get "the monster" or "it" */
                                                monster_desc(m_name, m_ptr, 0);
@@ -3006,7 +3006,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                        if (object_is_fixed_artifact(q_ptr) &&
                                                (p_ptr->pclass != CLASS_SNIPER || p_ptr->concent == 0))
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
 
                                                monster_desc(m_name, m_ptr, 0);
 
@@ -3021,7 +3021,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 
                                        if (fear && m_ptr->ml)
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
                                                sound(SOUND_FLEE);
                                                monster_desc(m_name, m_ptr, 0);
                                                msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
@@ -3259,7 +3259,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
        bool equiped_item = FALSE;
        bool return_when_thrown = FALSE;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        int msec = delay_factor * delay_factor * delay_factor;
 
@@ -3515,7 +3515,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                                /* Handle visible monster */
                                else
                                {
-                                       char m_name[80];
+                                       GAME_TEXT m_name[80];
                                        monster_desc(m_name, m_ptr, 0);
                                        msg_format(_("%sが%sに命中した。", "The %s hits %s."), o_name, m_name);
 
@@ -3588,7 +3588,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                                        if (fear && m_ptr->ml)
                                        {
                                                sound(SOUND_FLEE);
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
                                                monster_desc(m_name, m_ptr, 0);
                                                msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
                                        }
@@ -3635,7 +3635,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                                    is_friendly(&m_list[cave[y][x].m_idx]) &&
                                    !MON_INVULNER(m_ptr))
                                {
-                                       char m_name[80];
+                                       GAME_TEXT m_name[80];
                                        monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
                                        msg_format(_("%sは怒った!", "%^s gets angry!"), m_name);
                                        set_hostile(&m_list[cave[y][x].m_idx]);
index fdea209..18b94ab 100644 (file)
@@ -364,7 +364,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 {
        int day, hour, min;
        FILE *fff = NULL;
-       char file_name[80];
+       GAME_TEXT file_name[80];
        char buf[1024];
        cptr note_level = "";
        bool do_level = TRUE;
@@ -721,7 +721,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 static void do_cmd_disp_nikki(void)
 {
        char nikki_title[256];
-       char file_name[80];
+       GAME_TEXT file_name[80];
        char buf[1024];
        char tmp[80];
 #ifdef JP
@@ -858,7 +858,7 @@ static void do_cmd_last_get(void)
  */
 static void do_cmd_erase_nikki(void)
 {
-       char file_name[80];
+       GAME_TEXT file_name[80];
        char buf[256];
        FILE *fff = NULL;
 
@@ -3126,7 +3126,7 @@ void do_cmd_visuals(void)
                        /* Dump objects */
                        for (k_idx = 0; k_idx < max_k_idx; k_idx++)
                        {
-                               char o_name[80];
+                               GAME_TEXT o_name[80];
                                object_kind *k_ptr = &k_info[k_idx];
 
                                /* Skip non-entries */
@@ -4677,7 +4677,7 @@ cptr inven_res_label = _("                               酸電火冷毒光闇
 /* XTRA HACK RESLIST */
 static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, OBJECT_TYPE_VALUE tval, char *where)
 {
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        if (!o_ptr->k_idx) return;
@@ -4775,7 +4775,7 @@ static void do_cmd_knowledge_inven(void)
 {
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        store_type  *st_ptr;
 
@@ -5248,9 +5248,9 @@ static void do_cmd_knowledge_artifacts(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
-       char base_name[MAX_NLEN];
+       GAME_TEXT base_name[MAX_NLEN];
 
        bool *okay;
 
@@ -5410,7 +5410,7 @@ static void do_cmd_knowledge_uniques(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        int n_alive[10];
        int n_alive_surface = 0;
@@ -5532,7 +5532,7 @@ static void do_cmd_knowledge_weapon_exp(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        char tmp[30];
 
        /* Open a new file */
@@ -5591,7 +5591,7 @@ static void do_cmd_knowledge_spell_exp(void)
        FILE *fff;
        const magic_type *s_ptr;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
@@ -5677,8 +5677,8 @@ static void do_cmd_knowledge_skill_exp(void)
 
        FILE *fff;
 
-       char file_name[1024];
-       char skill_name[3][20]={_("マーシャルアーツ", "Martial Arts    "),
+       GAME_TEXT file_name[1024];
+       GAME_TEXT skill_name[3][20]={_("マーシャルアーツ", "Martial Arts    "),
                                                        _("二刀流          ", "Dual Wielding   "), 
                                                        _("乗馬            ", "Riding          ")};
 
@@ -5845,10 +5845,10 @@ static void do_cmd_knowledge_pets(void)
        int             i;
        FILE            *fff;
        monster_type    *m_ptr;
-       char            pet_name[80];
+       GAME_TEXT pet_name[80];
        int             t_friends = 0;
        int             show_upkeep = 0;
-       char            file_name[1024];
+       GAME_TEXT file_name[1024];
 
 
        /* Open a new file */
@@ -5915,7 +5915,7 @@ static void do_cmd_knowledge_kill_count(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        s32b Total = 0;
 
@@ -6753,7 +6753,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
        /* Display lines until done */
        for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++)
        {
-               char o_name[80];
+               GAME_TEXT o_name[80];
                TERM_COLOR a;
                byte c;
                object_kind *flavor_k_ptr;
@@ -7570,7 +7570,7 @@ static void do_cmd_knowledge_kubi(void)
        int i;
        FILE *fff;
        
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        
        
        /* Open a new file */
@@ -7626,7 +7626,7 @@ static void do_cmd_knowledge_kubi(void)
 static void do_cmd_knowledge_virtues(void)
 {
        FILE *fff;      
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
                
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
@@ -7658,7 +7658,7 @@ static void do_cmd_knowledge_dungeon(void)
 {
        FILE *fff;
        
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        int i;
                
        /* Open a new file */
@@ -7703,7 +7703,7 @@ static void do_cmd_knowledge_stat(void)
 {
        FILE *fff;
        
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        int percent, v_nr;
        
        /* Open a new file */
@@ -8092,7 +8092,7 @@ void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)
 static void do_cmd_knowledge_quests(void)
 {
        FILE *fff;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        IDX *quest_num;
        int dummy;
        IDX i;
@@ -8147,9 +8147,9 @@ static void do_cmd_knowledge_home(void)
        FILE *fff;
 
        int i;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        store_type  *st_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr            paren = ")";
 
        process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
@@ -8225,7 +8225,7 @@ static void do_cmd_knowledge_autopick(void)
 {
        int k;
        FILE *fff;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
index 8f816bd..42c6778 100644 (file)
@@ -39,7 +39,7 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
 {
        byte feel;
        object_type *o_ptr = &inventory[slot];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* We know about it already, do not tell us again */
        if (o_ptr->ident & (IDENT_SENSE))return;
@@ -1113,7 +1113,7 @@ void leave_tower_check(void)
  */
 static void recharged_notice(object_type *o_ptr)
 {
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        cptr s;
 
@@ -1446,7 +1446,7 @@ static void process_world_aux_hp_and_sp(void)
                    !p_ptr->resist_lite)
                {
                        object_type * o_ptr = &inventory[INVEN_LITE];
-                       char o_name [MAX_NLEN];
+                       GAME_TEXT o_name [MAX_NLEN];
                        char ouch [MAX_NLEN+40];
 
                        /* Get an object description */
@@ -2636,7 +2636,7 @@ static void process_world_aux_curse(void)
                 */
                if ((p_ptr->cursed & TRC_TELEPORT_SELF) && one_in_(200))
                {
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        int i, i_keep = 0, count = 0;
 
@@ -2712,7 +2712,7 @@ static void process_world_aux_curse(void)
                        new_curse = get_curse(0, o_ptr);
                        if (!(o_ptr->curse_flags & new_curse))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
@@ -2735,7 +2735,7 @@ static void process_world_aux_curse(void)
                        new_curse = get_curse(1, o_ptr);
                        if (!(o_ptr->curse_flags & new_curse))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
@@ -2752,7 +2752,7 @@ static void process_world_aux_curse(void)
                        if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL,
                            (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_ANIMAL), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sが動物を引き寄せた!", "Your %s have attracted an animal!"), o_name);
@@ -2764,7 +2764,7 @@ static void process_world_aux_curse(void)
                {
                        if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DEMON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sが悪魔を引き寄せた!", "Your %s have attracted a demon!"), o_name);
@@ -2777,7 +2777,7 @@ static void process_world_aux_curse(void)
                        if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON,
                            (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DRAGON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sがドラゴンを引き寄せた!", "Your %s have attracted an dragon!"), o_name);
@@ -2790,7 +2790,7 @@ static void process_world_aux_curse(void)
                        if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD,
                            (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_desc(o_name, choose_cursed_obj_name(TRC_CALL_UNDEAD), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                                msg_format(_("%sが死霊を引き寄せた!", "Your %s have attracted an undead!"), o_name);
@@ -2817,7 +2817,7 @@ static void process_world_aux_curse(void)
                /* Handle HP draining */
                if ((p_ptr->cursed & TRC_DRAIN_HP) && one_in_(666))
                {
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
 
                        object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_HP), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                        msg_format(_("%sはあなたの体力を吸収した!", "Your %s drains HP from you!"), o_name);
@@ -2826,7 +2826,7 @@ static void process_world_aux_curse(void)
                /* Handle mana draining */
                if ((p_ptr->cursed & TRC_DRAIN_MANA) && p_ptr->csp && one_in_(666))
                {
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
 
                        object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_MANA), (OD_OMIT_PREFIX | OD_NAME_ONLY));
                        msg_format(_("%sはあなたの魔力を吸収した!", "Your %s drains mana from you!"), o_name);
@@ -3424,7 +3424,7 @@ static void process_world(void)
                }
                else if ((number_mon-1) == 0)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_type *wm_ptr;
 
                        wm_ptr = &m_list[win_m_idx];
@@ -4721,7 +4721,7 @@ static void pack_overflow(void)
 {
        if (inventory[INVEN_PACK].k_idx)
        {
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
                object_type *o_ptr;
 
                /* Is auto-destroy done? */
@@ -4885,7 +4885,7 @@ static void process_player(void)
                                x = p_ptr->x + ddx[p_ptr->fishing_dir];
                                if (place_monster_aux(0, y, x, r_idx, PM_NO_KAGE))
                                {
-                                       char m_name[80];
+                                       GAME_TEXT m_name[80];
                                        monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
                                        msg_format(_("%sが釣れた!", "You have a good catch!"), m_name);
                                        success = TRUE;
@@ -4928,7 +4928,7 @@ static void process_player(void)
 
                if (MON_CSLEEP(m_ptr))
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        /* Recover fully */
                        (void)set_monster_csleep(p_ptr->riding, 0);
@@ -4942,7 +4942,7 @@ static void process_player(void)
                        if (set_monster_stunned(p_ptr->riding,
                                (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_STUNNED(m_ptr) - 1)))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sを朦朧状態から立ち直らせた。", "%^s is no longer stunned."), m_name);
                        }
@@ -4954,7 +4954,7 @@ static void process_player(void)
                        if (set_monster_confused(p_ptr->riding,
                                (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_CONFUSED(m_ptr) - 1)))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sを混乱状態から立ち直らせた。", "%^s is no longer confused."), m_name);
                        }
@@ -4966,7 +4966,7 @@ static void process_player(void)
                        if(set_monster_monfear(p_ptr->riding,
                                (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_MONFEAR(m_ptr) - 1)))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sを恐怖から立ち直らせた。", "%^s is no longer fear."), m_name);
                        }
index 8c64f18..80ae5fb 100644 (file)
@@ -4184,7 +4184,7 @@ static void dump_aux_pet(FILE *fff)
        int i;
        bool pet = FALSE;
        bool pet_settings = FALSE;
-       char pet_name[80];
+       GAME_TEXT pet_name[80];
 
        for (i = m_max - 1; i >= 1; i--)
        {
@@ -4850,7 +4850,7 @@ static void dump_aux_mutations(FILE *fff)
 static void dump_aux_equipment_inventory(FILE *fff)
 {
        int i;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Dump the equipment */
        if (equip_cnt)
@@ -4893,7 +4893,7 @@ static void dump_aux_equipment_inventory(FILE *fff)
  */
 static void dump_aux_home_museum(FILE *fff)
 {
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        store_type  *st_ptr;
 
        /* Do we need it?? */
@@ -6648,7 +6648,7 @@ static void show_info(void)
                                /* Show 12 items */
                                for (j = 0; (j < 12) && (i < st_ptr->stock_num); j++, i++)
                                {
-                                       char o_name[MAX_NLEN];
+                                       GAME_TEXT o_name[MAX_NLEN];
                                        char tmp_val[80];
 
                                        /* Acquire item */
index 8a8605f..0f28fb9 100644 (file)
@@ -439,7 +439,7 @@ static void preserve_pet(void)
                for (i = m_max - 1; i >=1; i--)
                {
                        monster_type *m_ptr = &m_list[i];
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        if (!m_ptr->r_idx) continue;
                        if (!is_pet(m_ptr)) continue;
@@ -464,7 +464,7 @@ static void preserve_pet(void)
 
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%sは消え去った!", "%^s disappears!"), m_name);
                        }
@@ -592,7 +592,7 @@ static void place_pet(void)
                {
                        monster_type *m_ptr = &party_mon[i];
                        monster_race *r_ptr = real_r_ptr(m_ptr);
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        monster_desc(m_name, m_ptr, 0);
                        msg_format(_("%sとはぐれてしまった。", "You have lost sight of %s."), m_name);
index 254e9b6..46e5600 100644 (file)
@@ -306,7 +306,7 @@ void build_streamer(IDX feat, int chance)
 
                                                if (cheat_peek)
                                                {
-                                                       char o_name[MAX_NLEN];
+                                                       GAME_TEXT o_name[MAX_NLEN];
                                                        object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
                                                        msg_format(_("伝説のアイテム (%s) はストリーマーにより削除された。",
                                                                "Artifact (%s) was deleted by streamer."), o_name);
index 3a01865..a03fb8b 100644 (file)
@@ -141,6 +141,9 @@ typedef s16b POSITION_IDX;          /*!< ゲーム中の座標リストID型 */
 typedef s32b ALIGNMENT;                /*!< 善悪属性の型定義 */
 typedef byte FEAT_SUBTYPE;     /*!< 地形情報の副値 (トラップ種別/パターン種別/店舗種別)*/
 
+typedef char GAME_TEXT;                /*!< ゲーム中のテキスト型定義 */
+
+
 /*!
  * @var typedef s32b HIT_POINT
  * @brief HPとその増減量の型定義
index 559eb2c..2ca3b1f 100644 (file)
@@ -1076,7 +1076,7 @@ static void term_getsize(term_data *td)
 static void save_prefs_aux(int i)\r
 {\r
        term_data *td = &data[i];\r
-       char sec_name[128];\r
+       GAME_TEXT sec_name[128];\r
        char buf[1024];\r
 \r
        RECT rc;\r
@@ -1218,7 +1218,7 @@ static void save_prefs(void)
 static void load_prefs_aux(int i)\r
 {\r
        term_data *td = &data[i];\r
-       char sec_name[128];\r
+       GAME_TEXT sec_name[128];\r
        char tmp[1024];\r
 \r
        int wid, hgt, posx, posy;\r
index 19e4a37..a12d2a7 100644 (file)
@@ -688,7 +688,7 @@ static bool use_mane(int spell)
        {
                monster_type *m_ptr;
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                if (!target_set(TARGET_KILL)) return FALSE;
                if (!cave[target_row][target_col].m_idx) break;
@@ -729,7 +729,7 @@ static bool use_mane(int spell)
                IDX target_m_idx;
                monster_type *m_ptr;
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                if (!target_set(TARGET_KILL)) return FALSE;
                target_m_idx = cave[target_row][target_col].m_idx;
index 106fae3..71f1e13 100644 (file)
@@ -246,7 +246,7 @@ static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_off
 
        if ((atoffset(u32b, r_ptr, flags_offset) & aura_flag) && !immune)
        {
-               char mon_name[80];
+               GAME_TEXT mon_name[80];
                int aura_damage = damroll(1 + (r_ptr->level / 26), 1 + (r_ptr->level / 17));
 
                /* Hack -- Get the "died from" name */
@@ -295,7 +295,7 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
        int             n_weight = 0;
        monster_type    *m_ptr = &m_list[m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-       char            m_name[80];
+       GAME_TEXT m_name[80];
 
        int             dice_num, dice_side;
 
@@ -436,7 +436,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
        /* Access the weapon */
        object_type     *o_ptr = &inventory[INVEN_RARM + hand];
 
-       char            m_name[80];
+       GAME_TEXT m_name[80];
 
        bool            success_hit = FALSE;
        bool            backstab = FALSE;
@@ -1160,7 +1160,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
                                if (target_ptr->hold_o_idx)
                                {
                                        object_type *q_ptr = &o_list[target_ptr->hold_o_idx];
-                                       char o_name[MAX_NLEN];
+                                       GAME_TEXT o_name[MAX_NLEN];
 
                                        object_desc(o_name, q_ptr, OD_NAME_ONLY);
                                        q_ptr->held_m_idx = 0;
@@ -1323,7 +1323,7 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        cave_type       *c_ptr = &cave[y][x];
        monster_type    *m_ptr = &m_list[c_ptr->m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-       char            m_name[80];
+       GAME_TEXT m_name[80];
 
        disturb(FALSE, TRUE);
 
@@ -1519,9 +1519,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
        object_type *o_ptr;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
-       char m_name[80];
+       GAME_TEXT m_name[80];
 
        char ddesc[80];
 
@@ -3256,7 +3256,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 #ifdef JP
                msg_format("攻撃が%s自身を傷つけた!", m_name);
 #else
-               char m_name_self[80];
+               GAME_TEXT m_name_self[80];
 
                /* hisself */
                monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
index 5bb826f..469dcee 100644 (file)
@@ -1645,7 +1645,7 @@ static bool cast_ninja_spell(int spell)
        {
                monster_type *m_ptr;
                MONSTER_IDX m_idx;
-               char m_name[80];
+               GAME_TEXT m_name[80];
                int i;
                int path_n;
                u16b path_g[512];
index 97718f2..9336b59 100644 (file)
@@ -197,7 +197,7 @@ void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear,
 {
        monster_type *m_ptr = &m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
-       char m_name[160];
+       GAME_TEXT m_name[160];
        bool seen = is_seen(m_ptr);
 
        /* Can the player be aware of this attack? */
@@ -1426,7 +1426,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
        ARMOUR_CLASS ac;
        DEPTH rlev;
        int pt;
-       char            m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        char            temp[MAX_NLEN];
        bool            blinked;
        bool            explode = FALSE, touched = FALSE, fear = FALSE, dead = FALSE;
@@ -2111,7 +2111,7 @@ void process_monster(MONSTER_IDX m_idx)
 #ifdef JP
                        msg_print("地面に落とされた。");
 #else
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, &m_list[p_ptr->riding], 0);
                        msg_format("You have fallen from %s.", m_name);
 #endif
@@ -2142,14 +2142,14 @@ void process_monster(MONSTER_IDX m_idx)
 
                if (see_m)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, 0);
                        msg_format(_("%sは消え去った!", "%^s disappears!"), m_name);
                }
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name);
                }
@@ -2174,7 +2174,7 @@ void process_monster(MONSTER_IDX m_idx)
 
                        if (see_m)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
 
                                msg_format(_("%sは消え去った!", "%^s disappears!"), m_name);
@@ -2205,7 +2205,7 @@ void process_monster(MONSTER_IDX m_idx)
 
                if (m_ptr->hp < m_ptr->maxhp/3)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, 0);
 
                        if (is_riding_mon && riding_pinch < 2)
@@ -2269,7 +2269,7 @@ void process_monster(MONSTER_IDX m_idx)
                /* Notice the "waking up" */
                if (m_ptr->ml)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, 0);
                        msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
                }
@@ -2311,7 +2311,7 @@ void process_monster(MONSTER_IDX m_idx)
        {
                if (is_pet(m_ptr) || see_m)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, is_pet(m_ptr) ? MD_ASSUME_VISIBLE : 0);
                        msg_format(_("%^sは突然敵にまわった!", "%^s suddenly becomes hostile!"), m_name);
                }
@@ -2405,7 +2405,7 @@ void process_monster(MONSTER_IDX m_idx)
                    player_has_los_bold(oy, ox) &&
                    projectable(oy, ox, p_ptr->y, p_ptr->x))
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        char monmessage[1024];
                        cptr filename;
 
@@ -3066,7 +3066,7 @@ void process_monster(MONSTER_IDX m_idx)
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                                {
                                        BIT_FLAGS flgs[TR_FLAG_SIZE], flg2 = 0L, flg3 = 0L, flgr = 0L;
-                                       char m_name[80], o_name[MAX_NLEN];
+                                       GAME_TEXT m_name[80], o_name[MAX_NLEN];
                                        object_type *o_ptr = &o_list[this_o_idx];
 
                                        /* Acquire next object */
@@ -3254,7 +3254,7 @@ void process_monster(MONSTER_IDX m_idx)
                /* Message if seen */
                if (see_m)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, 0);
                        msg_format(_("%^sは戦いを決意した!", "%^s turns to fight!"), m_name);
                }
index c36ae14..105554a 100644 (file)
@@ -480,7 +480,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                                        /* Notice the "waking up" */
                                        if (m_ptr->ml)
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
                                                monster_desc(m_name, m_ptr, 0);
                                                msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
                                        }
@@ -502,7 +502,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                {
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sはもう加速されていない。", "%^s is no longer fast."), m_name);
                        }
@@ -515,7 +515,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                {
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sはもう減速されていない。", "%^s is no longer slow."), m_name);
                        }
@@ -532,7 +532,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                        /* Message if visible */
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
                        }
@@ -547,7 +547,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                        /* Message if visible */
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
                        }
@@ -561,7 +561,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                        /* Visual note */
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
 #ifndef JP
                                char m_poss[80];
 
@@ -584,7 +584,7 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                {
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sはもう無敵でない。", "%^s is no longer invulnerable."), m_name);
                        }
@@ -626,7 +626,7 @@ void process_monsters_mtimed(int mtimed_idx)
 void dispel_monster_status(MONSTER_IDX m_idx)
 {
        monster_type *m_ptr = &m_list[m_idx];
-       char         m_name[80];
+       GAME_TEXT m_name[80];
 
        monster_desc(m_name, m_ptr, 0);
        if (set_monster_invulner(m_idx, 0, TRUE))
@@ -658,7 +658,7 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
 
        if (vs_player)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
                monster_desc(m_name, m_ptr, 0);
 
                if (who == 1)
@@ -736,7 +736,7 @@ void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx)
 
        if (m_ptr->exp >= r_ptr->next_exp)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
                int old_hp = m_ptr->hp;
                int old_maxhp = m_ptr->max_maxhp;
                int old_r_idx = m_ptr->r_idx;
index 39be7c3..f8ec38d 100644 (file)
@@ -2251,7 +2251,7 @@ void anger_monster(monster_type *m_ptr)
        if (p_ptr->inside_battle) return;
        if (is_friendly(m_ptr))
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                monster_desc(m_name, m_ptr, 0);
                msg_format(_("%^sは怒った!", "%^s gets angry!"), m_name);
index b7d81a4..23884e7 100644 (file)
@@ -468,7 +468,7 @@ void compact_monsters(int size)
 
                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
                        }
@@ -1462,7 +1462,7 @@ void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode)
 
        cptr            name;
        char            buf[128];
-       char            silly_name[1024];
+       GAME_TEXT silly_name[1024];
        bool            seen, pron;
        bool            named = FALSE;
 
@@ -1904,7 +1904,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 
        if (!necro && m_ptr)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
                monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];
 
                power = r_ptr->level / 2;
@@ -1983,7 +1983,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
        else if(!necro)
        {
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[80];
                cptr desc;
 
                get_mon_num_prep(get_nightmare, NULL);
@@ -2798,7 +2798,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 
        if (m_idx == p_ptr->riding)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
                monster_desc(m_name, m_ptr, 0);
                msg_format(_("突然%sが変身した。", "Suddenly, %s transforms!"), old_m_name);
                if (!(r_ptr->flags7 & RF7_RIDING))
@@ -3251,7 +3251,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
                {
                        cptr color;
                        object_type *o_ptr;
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
 
                        if (r_ptr->level > p_ptr->lev + 30)
                                color = _("黒く", "black");
@@ -4047,7 +4047,7 @@ void message_pain(MONSTER_IDX m_idx, HIT_POINT dam)
        monster_type *m_ptr = &m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
-       char m_name[80];
+       GAME_TEXT m_name[80];
 
        /* Get the monster name */
        monster_desc(m_name, m_ptr, 0);
index 70d5ef1..a978e46 100644 (file)
@@ -1346,7 +1346,7 @@ bool make_attack_spell(MONSTER_IDX m_idx)
        BIT_FLAGS f4, f5, f6;
        monster_type *m_ptr = &m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
-       char m_name[80];
+       GAME_TEXT m_name[80];
 #ifndef JP
        char m_poss[80];
 #endif
index ddbc4fa..1f0bfbe 100644 (file)
@@ -265,8 +265,8 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
 
        byte spell[96], num = 0;
 
-       char m_name[160];
-       char t_name[160];
+       GAME_TEXT m_name[160];
+       GAME_TEXT t_name[160];
 
 #ifndef JP
        char m_poss[160];
index 8642a2f..df0e25f 100644 (file)
@@ -1066,7 +1066,7 @@ static bool cast_learned_spell(int spell, bool success)
        {
                monster_type *m_ptr;
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                if (!target_set(TARGET_KILL)) return FALSE;
                if (!cave[target_row][target_col].m_idx) break;
@@ -1104,7 +1104,7 @@ static bool cast_learned_spell(int spell, bool success)
                MONSTER_IDX target_m_idx;
                monster_type *m_ptr;
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                if (!target_set(TARGET_KILL)) return FALSE;
                target_m_idx = cave[target_row][target_col].m_idx;
index 58cbf89..e4718cb 100644 (file)
@@ -124,7 +124,7 @@ static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg
        bool see_either = see_monster(m_idx) || see_monster(t_idx);
        bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
        bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -212,7 +212,7 @@ void spell_RF4_SHRIEK(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
  */
 void spell_RF4_DISPEL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -311,7 +311,7 @@ HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_id
        bool see_either = see_monster(m_idx) || see_monster(t_idx);
        bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
        bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -749,7 +749,7 @@ HIT_POINT spell_RF5_BA_WATE(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I
        bool see_either = see_monster(m_idx) || see_monster(t_idx);
        bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER);
        bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
-       char t_name[80];
+       GAME_TEXT t_name[80];
        monster_name(t_idx, t_name);
 
 
@@ -836,7 +836,7 @@ HIT_POINT spell_RF5_BA_DARK(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I
 HIT_POINT spell_RF5_DRAIN_MANA(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
        HIT_POINT dam;
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -873,7 +873,7 @@ HIT_POINT spell_RF5_MIND_BLAST(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTE
        monster_type    *m_ptr = &m_list[m_idx];
        bool seen = (!p_ptr->blind && m_ptr->ml);
        HIT_POINT dam;
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -910,7 +910,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST
        monster_type *m_ptr = &m_list[m_idx];
        bool seen = (!p_ptr->blind && m_ptr->ml);
        HIT_POINT dam;
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -950,7 +950,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST
 */
 void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, cptr msg3, int MS_TYPE, int TARGET_TYPE)
 {
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -1398,7 +1398,7 @@ void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cp
        bool see_either = see_monster(m_idx) || see_monster(t_idx);
        bool see_t = see_monster(t_idx);
        bool known = monster_near_player(m_idx, t_idx);
-       char m_name[80], t_name[80];
+       GAME_TEXT m_name[80], t_name[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
 
@@ -1533,7 +1533,7 @@ void spell_RF5_BLIND(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        else if (TARGET_TYPE == MONSTER_TO_MONSTER)
        {
                cptr msg1;
-               char t_name[80];
+               GAME_TEXT t_name[80];
                monster_name(t_idx, t_name);
                
                if (streq(t_name, "it"))
@@ -1646,7 +1646,7 @@ void spell_RF5_SLOW(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        else if (TARGET_TYPE == MONSTER_TO_MONSTER)
        {
                cptr msg1;
-               char t_name[80];
+               GAME_TEXT t_name[80];
                monster_name(t_idx, t_name);
 
                if (streq(t_name, "it"))
@@ -1735,7 +1735,7 @@ void spell_RF6_HASTE(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 {
        bool see_m = see_monster(m_idx);
        monster_type    *m_ptr = &m_list[m_idx];
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        monspell_message_base(m_idx, t_idx,
@@ -1796,7 +1796,7 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        monster_type    *m_ptr = &m_list[m_idx];
        int rlev = monster_level_idx(m_idx);
        bool seen = (!p_ptr->blind && m_ptr->ml);
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        disturb(TRUE, TRUE);
@@ -1879,7 +1879,7 @@ void spell_RF6_INVULNER(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
 */
 void spell_RF6_BLINK(MONSTER_IDX m_idx, int TARGET_TYPE)
 {
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
        
        if (TARGET_TYPE==MONSTER_TO_PLAYER)
@@ -1910,7 +1910,7 @@ void spell_RF6_BLINK(MONSTER_IDX m_idx, int TARGET_TYPE)
 */
 void spell_RF6_TPORT(MONSTER_IDX m_idx, int TARGET_TYPE)
 {      
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
        
        if (TARGET_TYPE==MONSTER_TO_PLAYER)
@@ -1938,7 +1938,7 @@ HIT_POINT spell_RF6_WORLD(MONSTER_IDX m_idx)
 {
        monster_type    *m_ptr = &m_list[m_idx];
        MONSTER_IDX who = 0;
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        disturb(TRUE, TRUE);
@@ -2063,7 +2063,7 @@ HIT_POINT spell_RF6_SPECIAL_B(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER
        bool monster_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER);
        bool monster_to_monster = (TARGET_TYPE == MONSTER_TO_MONSTER);
        bool direct = player_bold(y, x);
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        disturb(TRUE, TRUE);
@@ -2122,7 +2122,7 @@ HIT_POINT spell_RF6_SPECIAL_B(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER
                        get_damage = take_hit(DAMAGE_NOESCAPE, dam, m_name, -1);
                        if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead)
                        {
-                               char m_name_self[80];
+                               GAME_TEXT m_name_self[80];
                                /* hisself */
                                monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
 
@@ -2210,7 +2210,7 @@ void spell_RF6_TELE_TO(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        else if (TARGET_TYPE == MONSTER_TO_MONSTER)
        {
                bool resists_tele = FALSE;
-               char t_name[80];
+               GAME_TEXT t_name[80];
                monster_name(t_idx, t_name);
 
                if (tr_ptr->flagsr & RFR_RES_TELE)
@@ -2274,7 +2274,7 @@ void spell_RF6_TELE_AWAY(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        else if (TARGET_TYPE == MONSTER_TO_MONSTER)
        {
                bool resists_tele = FALSE;
-               char t_name[80];
+               GAME_TEXT t_name[80];
                monster_name(t_idx, t_name);
 
                if (tr_ptr->flagsr & RFR_RES_TELE)
@@ -2402,7 +2402,7 @@ void spell_RF6_DARKNESS(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
        bool can_use_lite_area = FALSE;
        bool monster_to_monster = TARGET_TYPE == MONSTER_TO_MONSTER;
        bool monster_to_player = TARGET_TYPE == MONSTER_TO_PLAYER;
-       char t_name[80];
+       GAME_TEXT t_name[80];
        monster_name(t_idx, t_name);
 
        if ((p_ptr->pclass == CLASS_NINJA) &&
@@ -2476,7 +2476,7 @@ void spell_RF6_DARKNESS(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
 */
 void spell_RF6_TRAPS(POSITION y, POSITION x, MONSTER_IDX m_idx)
 {
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
        disturb(TRUE, TRUE);
 
@@ -2498,7 +2498,7 @@ void spell_RF6_TRAPS(POSITION y, POSITION x, MONSTER_IDX m_idx)
 void spell_RF6_FORGET(MONSTER_IDX m_idx)
 {
        int rlev = monster_level_idx(m_idx);
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        disturb(TRUE, TRUE);
@@ -2695,7 +2695,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
        int rlev = monster_level_idx(m_idx);
        int count = 0;
-       char m_name[80], t_name[80], m_poss[80];
+       GAME_TEXT m_name[80], t_name[80], m_poss[80];
        monster_name(m_idx, m_name);
        monster_name(t_idx, t_name);
        monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
@@ -3181,7 +3181,7 @@ MONSTER_NUMBER summon_NAZGUL(POSITION y, POSITION x, MONSTER_IDX m_idx)
        int count = 0, k;
        POSITION cy = y;
        POSITION cx = x;
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        if (p_ptr->blind)
@@ -3242,7 +3242,7 @@ void spell_RF6_S_HI_UNDEAD(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
        monster_type    *m_ptr = &m_list[m_idx];
        int rlev = monster_level_idx(m_idx);
        int k, count = 0;
-       char m_name[80];
+       GAME_TEXT m_name[80];
        monster_name(m_idx, m_name);
 
        disturb(TRUE, TRUE);
index 0c7797b..e8ec080 100644 (file)
@@ -2001,7 +2001,7 @@ void dump_mutations(FILE *OutFile)
 void do_cmd_knowledge_mutations(void)
 {
        FILE *fff;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
@@ -2302,7 +2302,7 @@ bool mutation_power_aux(int power)
                                {
                                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
                                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
                                        }
index 270165f..9b426ef 100644 (file)
@@ -45,7 +45,7 @@ void curse_equipment(PERCENTAGE chance, PERCENTAGE heavy_chance)
        BIT_FLAGS new_curse;\r
        BIT_FLAGS oflgs[TR_FLAG_SIZE];\r
        object_type *o_ptr = &inventory[INVEN_RARM + randint0(12)];\r
-       char o_name[MAX_NLEN];\r
+       GAME_TEXT o_name[MAX_NLEN];\r
 \r
        if (randint1(100) > chance) return;\r
 \r
index 9c75c7d..844849b 100644 (file)
@@ -517,7 +517,7 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode)
 
        char temp[70 * 20];
        cptr            info[128];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        int wid, hgt;
        POSITION rad;
        char desc[256];
@@ -1624,7 +1624,7 @@ void display_inven(void)
        object_type *o_ptr;
        TERM_COLOR attr = TERM_WHITE;
        char tmp_val[80];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        TERM_LEN wid, hgt;
 
        Term_get_size(&wid, &hgt);
@@ -1719,7 +1719,7 @@ void display_equip(void)
        object_type *o_ptr;
        TERM_COLOR attr = TERM_WHITE;
        char tmp_val[80];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        TERM_LEN wid, hgt;
 
        Term_get_size(&wid, &hgt);
@@ -2109,7 +2109,7 @@ COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode)
        int j, k, l, z = 0;
        int             col, cur_col, len;
        object_type     *o_ptr;
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char            tmp_val[80];
        COMMAND_CODE    out_index[23];
        TERM_COLOR      out_color[23];
@@ -2274,7 +2274,7 @@ COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode)
        int             col, cur_col, len;
        object_type     *o_ptr;
        char            tmp_val[80];
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        COMMAND_CODE    out_index[23];
        TERM_COLOR      out_color[23];
        char            out_desc[23][MAX_NLEN];
@@ -2495,7 +2495,7 @@ void toggle_inven_equip(void)
  */
 static bool verify(cptr prompt, INVENTORY_IDX item)
 {
-       char        o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char        out_val[MAX_NLEN+20];
        object_type *o_ptr;
 
@@ -3530,7 +3530,7 @@ COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_w
 
        object_type *o_ptr;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char tmp_val[80];
 
        COMMAND_CODE out_index[23];
@@ -4836,7 +4836,7 @@ void py_pickup_floor(bool pickup)
 {
        OBJECT_IDX this_o_idx, next_o_idx = 0;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        object_type *o_ptr;
 
        int floor_num = 0;
index 13f0ad9..134fd0a 100644 (file)
@@ -788,7 +788,7 @@ void object_aware(object_type *o_ptr)
        {
                object_type forge;
                object_type *q_ptr;
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
 
                q_ptr = &forge;
                object_copy(q_ptr, o_ptr);
@@ -2113,7 +2113,7 @@ int m_bonus(int max, DEPTH level)
  */
 static void object_mention(object_type *o_ptr)
 {
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        object_aware(o_ptr);
        object_known(o_ptr);
@@ -5073,7 +5073,7 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
 
        cave_type *c_ptr;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        bool flag = FALSE;
        bool done = FALSE;
@@ -5602,7 +5602,7 @@ void inven_item_charges(INVENTORY_IDX item)
 void inven_item_describe(INVENTORY_IDX item)
 {
        object_type *o_ptr = &inventory[item];
-       char        o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        object_desc(o_name, o_ptr, 0);
 
@@ -5791,7 +5791,7 @@ void floor_item_charges(INVENTORY_IDX item)
 void floor_item_describe(INVENTORY_IDX item)
 {
        object_type *o_ptr = &o_list[item];
-       char        o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        object_desc(o_name, o_ptr, 0);
 
@@ -6137,7 +6137,7 @@ INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt)
 
        cptr act;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
 
        /* Get the item to take off */
@@ -6217,7 +6217,7 @@ void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt)
        object_type *q_ptr;
        object_type *o_ptr;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Access original object */
        o_ptr = &inventory[item];
@@ -6451,7 +6451,7 @@ void display_koff(KIND_OBJECT_IDX k_idx)
        int         sval;
        REALM_IDX   use_realm;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
 
        /* Erase the window */
@@ -6892,7 +6892,7 @@ bool process_warning(POSITION xx, POSITION yy)
 {
        POSITION mx, my;
        cave_type *c_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
 #define WARNING_AWARE_RANGE 12
        int dam_max = 0;
@@ -7546,7 +7546,7 @@ static void drain_essence(void)
 
        if (object_is_known(o_ptr) && !object_is_nameless(o_ptr))
        {
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
                if (!get_check(format(_("本当に%sから抽出してよろしいですか?", "Really extract from %s? "), o_name))) return;
        }
@@ -7867,7 +7867,7 @@ static void add_essence(ESSENCE_IDX mode)
        int ask = TRUE;
        char out_val[160];
        int num[22];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        int use_essence;
        essence_type *es_ptr;
        bool able[22] = { 0 };
@@ -8359,7 +8359,7 @@ static void erase_essence(void)
        OBJECT_IDX item;
        cptr q, s;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        item_tester_hook = object_is_smith;
index 2853735..20306fa 100644 (file)
@@ -254,7 +254,7 @@ int inven_damage(inven_func typ, int perc)
        INVENTORY_IDX i;
        int j, k, amt;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        if (CHECK_MULTISHADOW()) return 0;
 
@@ -338,7 +338,7 @@ static bool minus_ac(void)
 {
        object_type *o_ptr = NULL;
        BIT_FLAGS flgs[TR_FLAG_SIZE];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Pick a (possibly empty) inventory slot */
        switch (randint1(7))
index 3bcbd64..17326bd 100644 (file)
@@ -31,7 +31,7 @@ static bool do_cmd_archer(void)
        object_type     *q_ptr;
 
        char com[80];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        q_ptr = &forge;
 
@@ -251,7 +251,7 @@ bool gain_magic(void)
        int ext = 0;
        cptr q, s;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Only accept legal items */
        item_tester_hook = item_tester_hook_recharge;
@@ -1045,7 +1045,7 @@ static bool cmd_racial_power_aux(s32b command)
                }
                case CLASS_CAVALRY:
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_type *m_ptr;
                        monster_race *r_ptr;
                        int rlev;
index 35ba6d5..c43f4ca 100644 (file)
@@ -414,7 +414,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        OBJECT_IDX item;
                        cptr q, s;
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        u32b f[TR_FLAG_SIZE];
 
@@ -710,7 +710,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        OBJECT_IDX item;
                        cptr q, s;
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        u32b f[TR_FLAG_SIZE];
 
index ca0d25e..a8d162f 100644 (file)
@@ -287,7 +287,7 @@ cptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                POSITION oy = y, ox = x;
                                MONSTER_IDX m_idx = cave[y][x].m_idx;
                                monster_type *m_ptr = &m_list[m_idx];
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
 
                                monster_desc(m_name, m_ptr, 0);
 
@@ -533,7 +533,7 @@ cptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                {
                                        if (!monster_living(m_ptr->r_idx))
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
 
                                                monster_desc(m_name, m_ptr, 0);
                                                msg_format(_("%sには効果がない!", "%s is unharmed!"), m_name);
index 1bc1f83..809e330 100644 (file)
@@ -270,7 +270,7 @@ static errr make_dump(BUF* dumpbuf)
 {
        char            buf[1024];
        FILE *fff;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
index feddd4e..718c119 100644 (file)
@@ -111,7 +111,7 @@ void self_knowledge(void)
        info[i++] = buf[1];\r
        for (v_nr = 0; v_nr < 8; v_nr++)\r
        {\r
-               char vir_name [20];\r
+               GAME_TEXT vir_name [20];\r
                char vir_desc[80];\r
                int tester = p_ptr->virtues[v_nr];\r
        \r
index a1866a4..7b6c75f 100644 (file)
@@ -49,7 +49,7 @@ bool test_hit_fire(int chance, monster_type *m_ptr, int vis, char* o_name)
        {
                if (m_ptr->r_idx == MON_GOEMON && !MON_CSLEEP(m_ptr))
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        /* Extract monster name */
                        monster_desc(m_name, m_ptr, 0);
index 1ef3de9..e80f2c5 100644 (file)
@@ -1262,7 +1262,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
        BIT_FLAGS flgs[TR_FLAG_SIZE];
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        KIND_OBJECT_IDX k_idx = 0;
        bool is_potion = FALSE;
@@ -1686,7 +1686,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        bool heal_leper = FALSE;
 
        /* Hold the monster name */
-       char m_name[80];
+       GAME_TEXT m_name[80];
        char m_poss[10];
 
        PARAMETER_VALUE photo = 0;
@@ -5111,7 +5111,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
        monster_type *m_ptr = NULL;
 
        /* Monster name (for attacks) */
-       char m_name[80];
+       GAME_TEXT m_name[80];
 
        /* Monster name (for damage) */
        char killer[80];
@@ -6161,7 +6161,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
        if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE))
                && (get_damage > 0) && !p_ptr->is_dead && (who > 0))
        {
-               char m_name_self[80];
+               GAME_TEXT m_name_self[80];
 
                /* hisself */
                monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
@@ -6710,7 +6710,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        bool jump = FALSE;
 
        /* Attacker's name (prepared before polymorph)*/
-       char who_name[80];
+       GAME_TEXT who_name[80];
 
        /* Can the player see the source of this effect? */
        bool see_s_msg = TRUE;
@@ -7699,7 +7699,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
 
        if (p_ptr->riding)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                monster_desc(m_name, &m_list[p_ptr->riding], 0);
 
index 801f282..da33ca4 100644 (file)
@@ -1011,7 +1011,7 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
        {
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
@@ -1023,7 +1023,7 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
        if (resist && player_cast)
        {
                bool see_m = is_seen(m_ptr);
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                monster_desc(m_name, m_ptr, 0);
                if (see_m)
@@ -1235,7 +1235,7 @@ bool probing(void)
                /* Probe visible monsters */
                if (m_ptr->ml)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        /* Start the message */
                        if (!probe)
@@ -1434,7 +1434,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                                {
                                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                                        {
-                                               char m_name[80];
+                                               GAME_TEXT m_name[80];
 
                                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name);
@@ -1467,7 +1467,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
 
                                                if (in_generate && cheat_peek)
                                                {
-                                                       char o_name[MAX_NLEN];
+                                                       GAME_TEXT o_name[MAX_NLEN];
                                                        object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
                                                        msg_format(_("伝説のアイテム (%s) は生成中に*破壊*された。", "Artifact (%s) was *destroyed* during generation."), o_name);
                                                }
@@ -1807,7 +1807,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 
                        if (m_idx)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
                                monster_type *m_ptr = &m_list[m_idx];
 
                                /* Get the monster's real name */
@@ -1858,7 +1858,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
                                if (!(r_ptr->flags2 & (RF2_KILL_WALL)) &&
                                    !(r_ptr->flags2 & (RF2_PASS_WALL)))
                                {
-                                       char m_name[80];
+                                       GAME_TEXT m_name[80];
 
                                        /* Assume not safe */
                                        sn = 0;
@@ -2134,7 +2134,7 @@ void discharge_minion(void)
                /* Uniques resist discharging */
                if (r_ptr->flags1 & RF1_UNIQUE)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_desc(m_name, m_ptr, 0x00);
                        msg_format(_("%sは爆破されるのを嫌がり、勝手に自分の世界へと帰った。", "%^s resists to be blasted, and run away."), m_name);
                        delete_monster_idx(i);
@@ -2150,7 +2150,7 @@ void discharge_minion(void)
 
                if (record_named_pet && m_ptr->nickname)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name);
@@ -2223,7 +2223,7 @@ static void cave_temp_room_lite(void)
                                /* Notice the "waking up" */
                                if (m_ptr->ml)
                                {
-                                       char m_name[80];
+                                       GAME_TEXT m_name[80];
                                        monster_desc(m_name, m_ptr, 0);
                                        msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
                                }
@@ -3992,7 +3992,7 @@ bool rush_attack(bool *mdeath)
                else if (!player_bold(ty, tx))
                {
                        /* Hold the monster name */
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        /* Get the monster name (BEFORE polymorphing) */
                        monster_desc(m_name, m_ptr, 0);
@@ -5000,7 +5000,7 @@ bool psychometry(void)
 {
        OBJECT_IDX      item;
        object_type     *o_ptr;
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        byte            feel;
        cptr            q, s;
        bool okay = FALSE;
index 5189584..6c3975e 100644 (file)
@@ -575,7 +575,7 @@ void teleport_away_followable(MONSTER_IDX m_idx)
 void teleport_level(MONSTER_IDX m_idx)
 {
        bool         go_up;
-       char         m_name[160];
+       GAME_TEXT m_name[160];
        bool         see_m = TRUE;
 
        if (m_idx <= 0) /* To player */
@@ -958,7 +958,7 @@ bool apply_disenchant(BIT_FLAGS mode)
 {
        int             t = 0;
        object_type     *o_ptr;
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        int to_h, to_d, to_a, pval;
 
        /* Pick a random slot */
@@ -1238,7 +1238,7 @@ void brand_weapon(int brand_type)
                cptr act = NULL;
 
                /* Let's get the name before it is changed... */
-               char o_name[MAX_NLEN];
+               GAME_TEXT o_name[MAX_NLEN];
                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
                switch (brand_type)
@@ -1360,7 +1360,7 @@ static bool vanish_dungeon(void)
        cave_type *c_ptr;
        feature_type *f_ptr;
        monster_type *m_ptr;
-       char m_name[80];
+       GAME_TEXT m_name[80];
 
        /* Prevent vasishing of quest levels and town */
        if ((p_ptr->inside_quest && is_fixed_quest_idx(p_ptr->inside_quest)) || !dun_level)
@@ -1578,7 +1578,7 @@ void fetch(DIRECTION dir, WEIGHT wgt, bool require_los)
        OBJECT_IDX i;
        cave_type *c_ptr;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Check to see if an object is already there */
        if (cave[p_ptr->y][p_ptr->x].o_idx)
@@ -1923,7 +1923,7 @@ bool alchemy(void)
        PRICE price;
        bool force = FALSE;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char out_val[MAX_NLEN+40];
 
        cptr q, s;
@@ -2183,7 +2183,7 @@ bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac)
        OBJECT_IDX item;
        bool        okay = FALSE;
        object_type *o_ptr;
-       char        o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr        q, s;
 
        /* Assume enchant weapon */
@@ -2247,7 +2247,7 @@ bool artifact_scroll(void)
        OBJECT_IDX item;
        bool            okay = FALSE;
        object_type     *o_ptr;
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr            q, s;
 
        /* Enchant weapon/armour */
@@ -2368,7 +2368,7 @@ bool artifact_scroll(void)
 bool identify_item(object_type *o_ptr)
 {
        bool old_known = FALSE;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        object_desc(o_name, o_ptr, 0);
 
@@ -2422,7 +2422,7 @@ bool ident_spell(bool only_equip)
 {
        OBJECT_IDX item;
        object_type     *o_ptr;
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr            q, s;
        bool old_known;
 
@@ -2561,7 +2561,7 @@ bool identify_fully(bool only_equip)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr q, s;
        bool old_known;
 
@@ -2667,7 +2667,7 @@ bool recharge(int power)
        byte fail_type = 1;
 
        cptr q, s;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Only accept legal items */
        item_tester_hook = item_tester_hook_recharge;
@@ -2949,7 +2949,7 @@ bool bless_weapon(void)
        OBJECT_IDX item;
        object_type *o_ptr;
        BIT_FLAGS flgs[TR_FLAG_SIZE];
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr q, s;
 
        /* Bless only weapons */
@@ -3118,7 +3118,7 @@ bool pulish_shield(void)
        OBJECT_IDX item;
        object_type     *o_ptr;
        BIT_FLAGS flgs[TR_FLAG_SIZE];
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr            q, s;
 
        /* Assume enchant weapon */
@@ -4005,7 +4005,7 @@ bool rustproof(void)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       char        o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr        q, s;
 
        /* Select a piece of armour */
@@ -4064,7 +4064,7 @@ bool curse_armor(void)
        int i;
        object_type *o_ptr;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
 
        /* Curse the body armor */
@@ -4136,7 +4136,7 @@ msg_format("%sが%sを包み込もうとしたが、%sはそれを跳ね返し
 bool curse_weapon_object(bool force, object_type *o_ptr)
 {
        int i;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        /* Nothing to curse */
        if (!o_ptr->k_idx) return (FALSE);
@@ -4492,7 +4492,7 @@ bool eat_magic(int power)
        byte fail_type = 1;
 
        cptr q, s;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        item_tester_hook = item_tester_hook_recharge;
 
@@ -4980,7 +4980,7 @@ bool shock_power(void)
                MONSTER_IDX m_idx = cave[y][x].m_idx;
                monster_type *m_ptr = &m_list[m_idx];
                monster_race *r_ptr = &r_info[m_ptr->r_idx];
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                monster_desc(m_name, m_ptr, 0);
 
index f16062c..ca43b8a 100644 (file)
@@ -2228,7 +2228,7 @@ static void display_entry(int pos)
        object_type     *o_ptr;
        s32b            x;
 
-       char            o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char            out_val[160];
 
        int maxwid = 75;
@@ -3399,7 +3399,7 @@ static void store_purchase(void)
 
        object_type *o_ptr;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        char out_val[160];
 
@@ -3783,7 +3783,7 @@ static void store_sell(void)
 
        cptr q, s;
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
 
        /* Prepare a prompt */
@@ -4094,7 +4094,7 @@ static void store_examine(void)
        int         i;
        COMMAND_CODE item;
        object_type *o_ptr;
-       char        o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char        out_val[160];
 
        /* Empty? */
@@ -4155,7 +4155,7 @@ static void museum_remove_object(void)
        int i;
        COMMAND_CODE item;
        object_type *o_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        char out_val[160];
 
        /* Empty? */
@@ -4815,7 +4815,7 @@ void do_cmd_store(void)
                                object_type forge;
                                object_type *q_ptr;
 
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                /* Give a message */
                                msg_print(_("ザックからアイテムがあふれてしまった!", "Your pack overflows!"));
index 10ccb95..ef66349 100644 (file)
@@ -1461,10 +1461,10 @@ typedef struct building_type building_type;
 struct building_type
 {
        char name[20];                  /* proprietor name */
-       char owner_name[20];            /* proprietor name */
+       GAME_TEXT owner_name[20];            /* proprietor name */
        char owner_race[20];            /* proprietor race */
 
-       char act_names[8][30];          /* action names */
+       GAME_TEXT act_names[8][30];          /* action names */
        PRICE member_costs[8];           /* Costs for class members of building */
        PRICE other_costs[8];               /* Costs for nonguild members */
        char letters[8];                /* action letters */
index b6bd286..fb9fbbd 100644 (file)
@@ -1615,7 +1615,7 @@ static void do_cmd_wiz_zap(void)
                {
                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[80];
 
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
@@ -1649,7 +1649,7 @@ static void do_cmd_wiz_zap_all(void)
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
index cbe025a..893bddd 100644 (file)
@@ -588,7 +588,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                do_cmd_write_nikki(NIKKI_NAMED_PET, 3, m_name);
@@ -649,7 +649,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                p_ptr->arena_number++;
                if (record_arena)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        
                        /* Extract monster name */
                        monster_desc(m_name, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
@@ -1395,7 +1395,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
        /* It is dead now */
        if (m_ptr->hp < 0)
        {
-               char m_name[80];
+               GAME_TEXT m_name[80];
 
                if (r_info[m_ptr->r_idx].flags7 & RF7_TANUKI)
                {
@@ -2734,7 +2734,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
        {
                monster_type *m_ptr = &m_list[c_ptr->m_idx];
                monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
-               char m_name[80];
+               GAME_TEXT m_name[80];
                bool recall = FALSE;
 
                /* Not boring */
@@ -2834,7 +2834,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                /* Scan all objects being carried */
                for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
 
                        object_type *o_ptr;
                        o_ptr = &o_list[this_o_idx];
@@ -2882,7 +2882,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                {
                        if (floor_num == 1)
                        {
-                               char o_name[MAX_NLEN];
+                               GAME_TEXT o_name[MAX_NLEN];
 
                                object_type *o_ptr;
                                o_ptr = &o_list[floor_list[0]];
@@ -2992,7 +2992,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 
                if (o_ptr->marked & OM_FOUND)
                {
-                       char o_name[MAX_NLEN];
+                       GAME_TEXT o_name[MAX_NLEN];
 
                        /* Not boring */
                        boring = FALSE;
@@ -3937,7 +3937,7 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
                }
                else
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_type *m_ptr = &m_list[p_ptr->riding];
 
                        monster_desc(m_name, m_ptr, 0);
@@ -4082,7 +4082,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
                }
                else
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[80];
                        monster_type *m_ptr = &m_list[p_ptr->riding];
 
                        monster_desc(m_name, m_ptr, 0);
@@ -4117,7 +4117,7 @@ void gain_level_reward(int chosen_reward)
        OBJECT_SUBTYPE_VALUE dummy2 = 0;
        int         type, effect;
        cptr        reward = NULL;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        int count = 0;