[Refactor] #37353 コメント整理。 / Refactor comments.

[hengband/hengband.git] / src / dungeon.c

diff --git a/src/dungeon.c b/src/dungeon.c
index 8f816bd..4eeab50 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -25,6 +25,7 @@
 #include "object-curse.h"
 #include "store.h"
 #include "monsterrace-hook.h"
+#include "world.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
@@ -39,7 +40,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 +1114,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 +1447,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 */
@@ -2294,7 +2295,7 @@ static void process_world_aux_mutation(void)
                if (pet) mode |= PM_FORCE_PET;
                else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
 
-               if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, mode))
+               if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, mode, '\0'))
                {
                        msg_print(_("あなたはデーモンを引き寄せた！", "You have attracted a demon!"));
                        disturb(FALSE, TRUE);
@@ -2403,7 +2404,7 @@ static void process_world_aux_mutation(void)
                if (pet) mode |= PM_FORCE_PET;
                else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
 
-               if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL, mode))
+               if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL, mode, '\0'))
                {
                        msg_print(_("動物を引き寄せた！", "You have attracted an animal!"));
                        disturb(FALSE, TRUE);
@@ -2481,7 +2482,7 @@ static void process_world_aux_mutation(void)
                if (pet) mode |= PM_FORCE_PET;
                else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
 
-               if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON, mode))
+               if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON, mode, '\0'))
                {
                        msg_print(_("ドラゴンを引き寄せた！", "You have attracted a dragon!"));
                        disturb(FALSE, TRUE);
@@ -2636,7 +2637,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 +2713,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 +2736,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));
 
@@ -2749,10 +2750,9 @@ static void process_world_aux_curse(void)
                /* Call animal */
                if ((p_ptr->cursed & TRC_CALL_ANIMAL) && one_in_(2500))
                {
-                       if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL,
-                           (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+                       if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
                        {
-                               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);
@@ -2762,9 +2762,9 @@ static void process_world_aux_curse(void)
                /* Call demon */
                if ((p_ptr->cursed & TRC_CALL_DEMON) && one_in_(1111))
                {
-                       if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+                       if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
                        {
-                               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);
@@ -2775,9 +2775,9 @@ static void process_world_aux_curse(void)
                if ((p_ptr->cursed & TRC_CALL_DRAGON) && one_in_(800))
                {
                        if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON,
-                           (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+                           (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
                        {
-                               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);
@@ -2788,9 +2788,9 @@ static void process_world_aux_curse(void)
                if ((p_ptr->cursed & TRC_CALL_UNDEAD) && one_in_(1111))
                {
                        if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD,
-                           (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+                           (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
                        {
-                               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[MAX_NLEN];
                        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[MAX_NLEN];
                                        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[MAX_NLEN];
 
                        /* 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[MAX_NLEN];
                                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[MAX_NLEN];
                                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[MAX_NLEN];
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%^sを恐怖から立ち直らせた。", "%^s is no longer fear."), m_name);
                        }
@@ -6208,14 +6208,8 @@ void play_game(bool new_game)
                /* Cancel the health bar */
                health_track(0);
 
-
-               /* Forget the lite */
                forget_lite();
-
-               /* Forget the view */
                forget_view();
-
-               /* Forget the view */
                clear_mon_lite();
 
                /* Handle "quit and save" */