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

[hengband/hengband.git] / src / floor-streams.c

diff --git a/src/floor-streams.c b/src/floor-streams.c
index 755705c..46e5600 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -33,11 +33,11 @@
  * @param width 基本幅
  * @return なし
  */
-static void recursive_river(int x1, int y1, int x2, int y2, IDX feat1, IDX feat2, int width)
+static void recursive_river(POSITION x1, POSITION y1, POSITION x2, POSITION y2, FEAT_IDX feat1, FEAT_IDX feat2, POSITION width)
 {
-       int dx, dy, length, l, x, y;
-       int changex, changey;
-       int ty, tx;
+       POSITION dx, dy, length, l, x, y;
+       POSITION changex, changey;
+       POSITION ty, tx;
        bool done;
        cave_type *c_ptr;
 
@@ -264,8 +264,6 @@ void build_streamer(IDX feat, int chance)
                                if (!in_bounds2(ty, tx)) continue;
                                break;
                        }
-
-                       /* Access the grid */
                        c_ptr = &cave[ty][tx];
                        f_ptr = &f_info[c_ptr->feat];
 
@@ -290,12 +288,11 @@ void build_streamer(IDX feat, int chance)
 
                        if (c_ptr->o_idx && !have_flag(streamer_ptr->flags, FF_DROP))
                        {
-                               s16b this_o_idx, next_o_idx = 0;
+                               OBJECT_IDX this_o_idx, next_o_idx = 0;
 
                                /* Scan all objects in the grid */
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                                {
-                                       /* Acquire object */
                                        object_type *o_ptr = &o_list[this_o_idx];
 
                                        /* Acquire next object */
@@ -309,22 +306,16 @@ 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));
-#ifdef JP
-                                                       msg_format("伝説のアイテム (%s) はストリーマーにより削除された。", o_name);
-#else
-                                                       msg_format("Artifact (%s) was deleted by streamer.", o_name);
-#endif
+                                                       msg_format(_("伝説のアイテム (%s) はストリーマーにより削除された。",
+                                                               "Artifact (%s) was deleted by streamer."), o_name);
                                                }
                                        }
                                        else if (cheat_peek && o_ptr->art_name)
                                        {
-#ifdef JP
-                                               msg_print("ランダム・アーティファクトの1つはストリーマーにより削除された。");
-#else
-                                               msg_print("One of the random artifacts was deleted by streamer.");
-#endif
+                                               msg_print(_("ランダム・アーティファクトの1つはストリーマーにより削除された。",
+                                                       "One of the random artifacts was deleted by streamer."));
                                        }
                                }
 
@@ -447,7 +438,8 @@ void place_trees(POSITION x, POSITION y)
  */
 void destroy_level(void)
 {
-       int y1, x1, n;
+       POSITION y1, x1;
+       int n;
 
        /* Note destroyed levels */
        msg_print_wizard(CHEAT_DUNGEON, _("階に*破壊*の痕跡を生成しました。", "Destroyed Level."));