*/
s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode)
{
- int i = 0;
+ s16b i = 0;
char *s = buf;
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++)
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 */
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 */
};
* @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;
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" */
*/\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
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
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. */
*/
s16b quark_add(cptr str)
{
- int i;
+ s16b i;
/* Look for an existing quark */
for (i = 1; i < quark__num; i++)