"HURT_ROCK",
"HURT_FIRE",
"HURT_COLD",
- "XXX",
+ "ANGEL",
"XXX",
"XXX",
"XXX",
"S_UNIQUE"
};
+#if 0
/*!
* モンスター特性トークン(発動型能力3) /
* Monster race flags
"XXXA3X30",
"XXXA3X31",
};
+#endif
+#if 0
/*!
* モンスター特性トークン(発動型能力4) /
* Monster race flags
"XXXA4X30",
"XXXA4X31",
};
+#endif
/*!
*/
static errr grab_one_feat_action(feature_type *f_ptr, cptr what, int count)
{
- int i;
+ FF_FLAGS_IDX i;
/* Check flags */
for (i = 0; i < FF_FLAG_MAX; i++)
}
/* Default "mimic" */
- f_ptr->mimic = (IDX)i;
+ f_ptr->mimic = (FEAT_IDX)i;
/* Default "destroyed state" -- if not specified */
- f_ptr->destroyed = (IDX)i;
+ f_ptr->destroyed = (FEAT_IDX)i;
/* Default "states" */
for (i = 0; i < MAX_FEAT_STATES; i++) f_ptr->state[i].action = FF_FLAG_MAX;
if (!add_tag(&offset, head, buf + 2)) return PARSE_ERROR_OUT_OF_MEMORY;
/* Record a fake tag index */
- f_ptr->mimic = -offset;
+ f_ptr->mimic_tag = offset;
}
if (1 == sscanf(s, "SUBTYPE_%d", &i))
{
/* Extract a "subtype" */
- f_ptr->subtype = i;
+ f_ptr->subtype = (FEAT_SUBTYPE)i;
/* Start at next entry */
s = t;
if (1 != sscanf(buf+2, "%d", &priority)) return (PARSE_ERROR_GENERIC);
/* Save the value */
- f_ptr->priority = priority;
+ f_ptr->priority = (FEAT_PRIORITY)priority;
}
/* Process 'K' for "States" (up to four lines + default (which cannot be last)) */
if (!add_tag(&offset, head, t)) return PARSE_ERROR_OUT_OF_MEMORY;
/* Record a fake tag index */
- f_ptr->destroyed = -offset;
+ f_ptr->destroyed_tag = offset;
}
else
{
if (!add_tag(&offset, head, t)) return PARSE_ERROR_OUT_OF_MEMORY;
/* Record a fake tag index */
- f_ptr->state[i].result = -offset;
+ f_ptr->state[i].result_tag = offset;
}
}
/*!
* @brief 地形タグからIDを得る /
* Search for real index corresponding to this fake tag
- * @param feat タグ文字列
- * @return なし
+ * @param feat タグ文字列のオフセット
+ * @return 地形ID。該当がないなら-1
*/
-static void search_real_feat(s16b *feat)
+static FEAT_IDX search_real_feat(STR_OFFSET feat)
{
- int i;
+ FEAT_IDX i;
/* Don't convert non-fake tag */
- if (*feat >= 0) return;
+ if (feat <= 0)
+ {
+ return -1;
+ }
/* Search for real index corresponding to this fake tag */
for (i = 0; i < f_head.info_num; i++)
{
- if ((-(*feat)) == f_info[i].tag)
+ if (feat == f_info[i].tag)
{
/* Record real index */
- *feat = (s16b)i;
- return;
+ return i;
}
}
/* Undefined tag */
- msg_format(_("未定義のタグ '%s'。", "%s is undefined."), f_tag + (-(*feat)));
+ msg_format(_("未定義のタグ '%s'。", "%s is undefined."), f_tag + feat);
+ return -1;
}
for (i = 0; i < head->info_num; i++)
{
feature_type *f_ptr = &f_info[i];
- int j;
+ FEAT_IDX j, k;
- search_real_feat(&f_ptr->mimic);
-
- search_real_feat(&f_ptr->destroyed);
-
- for (j = 0; j < MAX_FEAT_STATES; j++) search_real_feat(&f_ptr->state[j].result);
+ k = search_real_feat(f_ptr->mimic_tag);
+ f_ptr->mimic = k < 0 ? f_ptr->mimic : k;
+ k = search_real_feat(f_ptr->destroyed_tag);
+ f_ptr->destroyed = k < 0 ? f_ptr->destroyed : k;
+ for (j = 0; j < MAX_FEAT_STATES; j++)
+ {
+ k = search_real_feat(f_ptr->state[j].result_tag);
+ f_ptr->state[j].result = k < 0 ? f_ptr->state[j].result : k;
+ }
}
}
if (1 == sscanf(s, "MONSTER_DIV_%d", &monst))
{
/* Extract a "Special %" */
- d_ptr->special_div = monst;
+ d_ptr->special_div = (PROB)monst;
/* Start at next entry */
s = t;
struct dungeon_grid
{
- IDX feature; /* Terrain feature */
- IDX monster; /* Monster */
- IDX object; /* Object */
- IDX ego; /* Ego-Item */
- 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 */
+ 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 */
+ BIT_FLAGS cave_info; /* Flags for CAVE_MARK, CAVE_GLOW, CAVE_ICKY, CAVE_ROOM */
+ s16b special; /* Reserved for special terrain info */
int random; /* Number of the random effect */
};
building[index].letters[action_index] = zz[4][0];
/* Action code */
- building[index].actions[action_index] = atoi(zz[5]);
+ building[index].actions[action_index] = (BACT_IDX)atoi(zz[5]);
/* Action restriction */
- building[index].action_restr[action_index] = atoi(zz[6]);
+ building[index].action_restr[action_index] = (BACT_RESTRICT_IDX)atoi(zz[6]);
break;
}
q_ptr->k_idx = (IDX)atoi(zz[8]);
q_ptr->dungeon = (DUNGEON_IDX)atoi(zz[9]);
- if (num > 10)
- q_ptr->flags = atoi(zz[10]);
+ if (num > 10) q_ptr->flags = atoi(zz[10]);
r_ptr = &r_info[q_ptr->r_idx];
if (r_ptr->flags1 & RF1_UNIQUE)
/* Maximum quests */
else if (zz[0][0] == 'Q')
{
- max_quests = (IDX)atoi(zz[1]);
+ max_q_idx = (IDX)atoi(zz[1]);
}
/* Maximum r_idx */