#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

diff --git a/src/externs.h b/src/externs.h
index 6a4271f..8f3e449 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -393,9 +393,9 @@ extern s16b autosave_freq;
 extern bool autosave_t;
 extern bool autosave_l;
 extern bool closing_flag;
-extern s16b panel_row_min, panel_row_max;
-extern s16b panel_col_min, panel_col_max;
-extern s16b panel_col_prt, panel_row_prt;
+extern POSITION panel_row_min, panel_row_max;
+extern POSITION panel_col_min, panel_col_max;
+extern POSITION panel_col_prt, panel_row_prt;
 extern IDX target_who;
 extern POSITION target_col;
 extern POSITION target_row;
@@ -406,20 +406,20 @@ extern char player_base[32];
 extern char savefile[1024];
 extern char savefile_base[40];
 extern s16b lite_n;
-extern s16b lite_y[LITE_MAX];
-extern s16b lite_x[LITE_MAX];
+extern POSITION lite_y[LITE_MAX];
+extern POSITION lite_x[LITE_MAX];
 extern s16b mon_lite_n;
-extern s16b mon_lite_y[MON_LITE_MAX];
-extern s16b mon_lite_x[MON_LITE_MAX];
+extern POSITION mon_lite_y[MON_LITE_MAX];
+extern POSITION mon_lite_x[MON_LITE_MAX];
 extern s16b view_n;
-extern byte view_y[VIEW_MAX];
-extern byte view_x[VIEW_MAX];
+extern POSITION view_y[VIEW_MAX];
+extern POSITION view_x[VIEW_MAX];
 extern s16b temp_n;
-extern byte temp_y[TEMP_MAX];
-extern byte temp_x[TEMP_MAX];
+extern POSITION temp_y[TEMP_MAX];
+extern POSITION temp_x[TEMP_MAX];
 extern s16b redraw_n;
-extern byte redraw_y[REDRAW_MAX];
-extern byte redraw_x[REDRAW_MAX];
+extern POSITION redraw_y[REDRAW_MAX];
+extern POSITION redraw_x[REDRAW_MAX];
 extern s16b macro__num;
 extern cptr *macro__pat;
 extern cptr *macro__act;

diff --git a/src/variable.c b/src/variable.c
index e5eb40b..5b2f680 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -382,9 +382,9 @@ bool closing_flag;          /* Dungeon is closing */
  * Dungeon size info
  */
 
-s16b panel_row_min, panel_row_max;
-s16b panel_col_min, panel_col_max;
-s16b panel_col_prt, panel_row_prt;
+POSITION panel_row_min, panel_row_max;
+POSITION panel_col_min, panel_col_max;
+POSITION panel_col_prt, panel_row_prt;
 
 
 /*
@@ -419,36 +419,36 @@ char savefile_base[40];
  * Array of grids lit by player lite (see "cave.c")
  */
 s16b lite_n;
-s16b lite_y[LITE_MAX];
-s16b lite_x[LITE_MAX];
+POSITION lite_y[LITE_MAX];
+POSITION lite_x[LITE_MAX];
 
 /*
  * Array of grids lit by player lite (see "cave.c")
  */
 s16b mon_lite_n;
-s16b mon_lite_y[MON_LITE_MAX];
-s16b mon_lite_x[MON_LITE_MAX];
+POSITION mon_lite_y[MON_LITE_MAX];
+POSITION mon_lite_x[MON_LITE_MAX];
 
 /*
  * Array of grids viewable to the player (see "cave.c")
  */
 s16b view_n;
-byte view_y[VIEW_MAX];
-byte view_x[VIEW_MAX];
+POSITION view_y[VIEW_MAX];
+POSITION view_x[VIEW_MAX];
 
 /*
  * Array of grids for use by various functions (see "cave.c")
  */
 s16b temp_n;
-byte temp_y[TEMP_MAX];
-byte temp_x[TEMP_MAX];
+POSITION temp_y[TEMP_MAX];
+POSITION temp_x[TEMP_MAX];
 
 /*
  * Array of grids for delayed visual updating (see "cave.c")
  */
 s16b redraw_n = 0;
-byte redraw_y[REDRAW_MAX];
-byte redraw_x[REDRAW_MAX];
+POSITION redraw_y[REDRAW_MAX];
+POSITION redraw_x[REDRAW_MAX];
 
 
 /*