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

diff --git a/src/files.c b/src/files.c
index 64926f8..07e1218 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -124,7 +124,7 @@ void safe_setuid_grab(void)
  */
 s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode)
 {
-       int i = 0;
+       s16b i = 0;
 
        char *s = buf;
 

diff --git a/src/floors.c b/src/floors.c
index 0391fd8..eda6495 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -238,7 +238,7 @@ static void kill_saved_floor(saved_floor_type *sf_ptr)
 s16b get_new_floor_id(void)
 {
        saved_floor_type *sf_ptr = NULL;
-       int i;
+       s16b i;
 
        /* Look for empty space */
        for (i = 0; i < MAX_SAVED_FLOORS; i++)

diff --git a/src/init.h b/src/init.h
index 848a81d..d0e3e6d 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -78,12 +78,8 @@ struct header
        byte v_patch;           /* Version -- patch */
        byte v_extra;           /* Version -- extra */
 
-
        u16b info_num;          /* Number of "info" records */
-
-       u16b info_len;          /* Size of each "info" record */
-
-
+       int info_len;           /* Size of each "info" record */
        u16b head_size;         /* Size of the "header" in bytes */
 
        STR_OFFSET info_size;           /* Size of the "info" array in bytes */

diff --git a/src/init1.c b/src/init1.c
index 998e188..e51b849 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -3619,14 +3619,14 @@ typedef struct dungeon_grid dungeon_grid;
 
 struct dungeon_grid
 {
-       IDX             feature;                /* Terrain feature */
-       IDX             monster;                /* Monster */
-       IDX             object;                 /* Object */
-       IDX             ego;                    /* Ego-Item */
-       IDX             artifact;               /* Artifact */
+       FEAT_IDX feature;               /* Terrain feature */
+       MONSTER_IDX     monster;                /* Monster */
+       OBJECT_IDX object;                      /* Object */
+       EGO_IDX ego;                    /* Ego-Item */
+       ARTIFACT_IDX artifact;          /* Artifact */
        IDX             trap;                   /* Trap */
        int             cave_info;              /* Flags for CAVE_MARK, CAVE_GLOW, CAVE_ICKY, CAVE_ROOM */
-       int             special;                /* Reserved for special terrain info */
+       s16b special; /* Reserved for special terrain info */
        int             random;                 /* Number of the random effect */
 };
 

diff --git a/src/init2.c b/src/init2.c
index 00e01b4..d4a1ba6 100644 (file)
--- a/src/init2.c
+++ b/src/init2.c
@@ -404,7 +404,7 @@ static errr init_info_raw(int fd, header *head)
  * @param len データの長さ
  * @return エラーコード
  */
-static void init_header(header *head, int num, int len)
+static void init_header(header *head, IDX num, int len)
 {
        /* Save the "version" */
        head->v_major = FAKE_VER_MAJOR;
@@ -413,7 +413,7 @@ static void init_header(header *head, int num, int len)
        head->v_extra = 0;
 
        /* Save the "record" information */
-       head->info_num = num;
+       head->info_num = (IDX)num;
        head->info_len = len;
 
        /* Save the size of "*_head" and "*_info" */

diff --git a/src/main-win.c b/src/main-win.c
index 129a4ba..9e3e2fe 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -1381,11 +1381,9 @@ static void load_prefs(void)
  */\r
 static s16b tokenize_whitespace(char *buf, s16b num, char **tokens)\r
 {\r
-       int k = 0;\r
-\r
+       s16b k = 0;\r
        char *s = buf;\r
 \r
-\r
        /* Process */\r
        while (k < num)\r
        {\r
@@ -3199,11 +3197,13 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp, c
 static void windows_map(void)\r
 {\r
        term_data *td = &data[0];\r
-       byte a, c;\r
+       byte a;\r
+       char c;\r
        int x, min_x, max_x;\r
        int y, min_y, max_y;\r
 \r
-       byte ta, tc;\r
+       byte ta;\r
+       char tc;\r
 \r
        /* Only in graphics mode */\r
        if (!use_graphics) return;\r

diff --git a/src/types.h b/src/types.h
index 4fa714c..aae13d3 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1671,7 +1671,7 @@ typedef struct {
 typedef struct 
 {
        s16b floor_id;        /* No recycle until 65536 IDs are all used */
-       byte savefile_id;     /* ID for savefile (from 0 to MAX_SAVED_FLOOR) */
+       s16b savefile_id;     /* ID for savefile (from 0 to MAX_SAVED_FLOOR) */
        DEPTH dun_level;
        s32b last_visit;      /* Time count of last visit. 0 for new floor. */
        u32b visit_mark;      /* Older has always smaller mark. */

diff --git a/src/util.c b/src/util.c
index f11e077..57ea000 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -2353,7 +2353,7 @@ void quark_init(void)
  */
 s16b quark_add(cptr str)
 {
-       int i;
+       s16b i;
 
        /* Look for an existing quark */
        for (i = 1; i < quark__num; i++)