"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
/*!
* Returns FALSE when there isn't enough space available to store
* the text.
*/
-static bool add_tag(s16b *offset, header *head, cptr buf)
+static bool add_tag(STR_OFFSET *offset, header *head, cptr buf)
{
u32b i;
&typ, &rat, &hgt, &wid)) return (1);
/* Save the values */
- v_ptr->typ = typ;
- v_ptr->rat = rat;
- v_ptr->hgt = hgt;
- v_ptr->wid = wid;
+ v_ptr->typ = (ROOM_IDX)typ;
+ v_ptr->rat = (PROB)rat;
+ v_ptr->hgt = (POSITION)hgt;
+ v_ptr->wid = (POSITION)wid;
}
/* Oops */
if (4 != sscanf(buf+2, "%d:%d:%d:%d",
&level, &mana, &fail, &exp)) return (1);
- m_ptr->info[realm][magic_idx].slevel = level;
- m_ptr->info[realm][magic_idx].smana = mana;
- m_ptr->info[realm][magic_idx].sfail = fail;
- m_ptr->info[realm][magic_idx].sexp = exp;
+ m_ptr->info[realm][magic_idx].slevel = (PLAYER_LEVEL)level;
+ m_ptr->info[realm][magic_idx].smana = (MANA_POINT)mana;
+ m_ptr->info[realm][magic_idx].sfail = (PERCENTAGE)fail;
+ m_ptr->info[realm][magic_idx].sexp = (EXP)exp;
magic_idx ++;
}
*/
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;
/* Process 'M' for "Mimic" (one line only) */
else if (buf[0] == 'M')
{
- s16b offset;
+ STR_OFFSET offset;
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(s, "POWER_%d", &i))
{
/* Extract a "power" */
- f_ptr->power = i;
+ f_ptr->power = (FEAT_POWER)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)) */
else if (buf[0] == 'K')
{
- s16b offset;
+ STR_OFFSET offset;
/* Find the next empty state slot (if any) */
for (i = 0; i < MAX_FEAT_STATES; i++) if (f_ptr->state[i].action == FF_FLAG_MAX) break;
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;
}
}
/* Oops */
- else return (6);
+ else return (6);
/* Success */
return (0);
/*!
* @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;
+ }
}
}
&tval, &sval, &pval)) return (1);
/* Save the values */
- k_ptr->tval = tval;
- k_ptr->sval = sval;
- k_ptr->pval = pval;
+ k_ptr->tval = (OBJECT_TYPE_VALUE)tval;
+ k_ptr->sval = (OBJECT_SUBTYPE_VALUE)sval;
+ k_ptr->pval = (PARAMETER_VALUE)pval;
}
/* Process 'W' for "More Info" (one line only) */
&level, &extra, &wgt, &cost)) return (1);
/* Save the values */
- k_ptr->level = level;
- k_ptr->extra = extra;
- k_ptr->weight = wgt;
- k_ptr->cost = cost;
+ k_ptr->level = (DEPTH)level;
+ k_ptr->extra = (BIT_FLAGS8)extra;
+ k_ptr->weight = (WEIGHT)wgt;
+ k_ptr->cost = (PRICE)cost;
}
/* Process 'A' for "Allocation" (one line only) */
if (t && (!s || t < s))
{
int chance = atoi(t+1);
- if (chance > 0) k_ptr->chance[i] = chance;
+ if (chance > 0) k_ptr->chance[i] = (PROB)chance;
}
}
}
&tval, &sval, &pval)) return (1);
/* Save the values */
- a_ptr->tval = tval;
- a_ptr->sval = sval;
- a_ptr->pval = pval;
+ a_ptr->tval = (OBJECT_TYPE_VALUE)tval;
+ a_ptr->sval = (OBJECT_SUBTYPE_VALUE)sval;
+ a_ptr->pval = (PARAMETER_VALUE)pval;
}
/* Process 'W' for "More Info" (one line only) */
&level, &rarity, &wgt, &cost)) return (1);
/* Save the values */
- a_ptr->level = level;
- a_ptr->rarity = rarity;
- a_ptr->weight = wgt;
- a_ptr->cost = cost;
+ a_ptr->level = (DEPTH)level;
+ a_ptr->rarity = (RARITY)rarity;
+ a_ptr->weight = (WEIGHT)wgt;
+ a_ptr->cost = (PRICE)cost;
}
/* Hack -- Process 'P' for "power" and such */
if (6 != sscanf(buf+2, "%d:%dd%d:%d:%d:%d",
&ac, &hd1, &hd2, &th, &td, &ta)) return (1);
- a_ptr->ac = ac;
- a_ptr->dd = hd1;
- a_ptr->ds = hd2;
- a_ptr->to_h = th;
- a_ptr->to_d = td;
- a_ptr->to_a = ta;
+ a_ptr->ac = (ARMOUR_CLASS)ac;
+ a_ptr->dd = (DICE_NUMBER)hd1;
+ a_ptr->ds = (DICE_SID)hd2;
+ a_ptr->to_h = (HIT_PROB)th;
+ a_ptr->to_d = (HIT_POINT)td;
+ a_ptr->to_a = (ARMOUR_CLASS)ta;
}
/* Hack -- Process 'U' for activation index */
&slot, &rating)) return (1);
/* Save the values */
- e_ptr->slot = slot;
- e_ptr->rating = rating;
+ e_ptr->slot = (INVENTORY_IDX)slot;
+ e_ptr->rating = (PRICE)rating;
}
/* Process 'W' for "More Info" (one line only) */
if (4 != sscanf(buf+2, "%d:%d:%d:%d",
&th, &td, &ta, &pval)) return (1);
- e_ptr->max_to_h = th;
- e_ptr->max_to_d = td;
- e_ptr->max_to_a = ta;
+ e_ptr->max_to_h = (HIT_PROB)th;
+ e_ptr->max_to_d = (HIT_POINT)td;
+ e_ptr->max_to_a = (ARMOUR_CLASS)ta;
e_ptr->max_pval = (PARAMETER_VALUE)pval;
}
&spd, &hp1, &hp2, &aaf, &ac, &slp)) return (1);
/* Save the values */
- r_ptr->speed = spd;
- r_ptr->hdice = MAX(hp1, 1);
- r_ptr->hside = MAX(hp2, 1);
- r_ptr->aaf = aaf;
- r_ptr->ac = ac;
- r_ptr->sleep = slp;
+ r_ptr->speed = (SPEED)spd;
+ r_ptr->hdice = (DICE_NUMBER)MAX(hp1, 1);
+ r_ptr->hside = (DICE_SID)MAX(hp2, 1);
+ r_ptr->aaf = (POSITION)aaf;
+ r_ptr->ac = (ARMOUR_CLASS)ac;
+ r_ptr->sleep = (SLEEP_DEGREE)slp;
}
/* Process 'W' for "More Info" (one line only) */
/* Save the values */
r_ptr->level = (DEPTH)lev;
r_ptr->rarity = (RARITY)rar;
- r_ptr->extra = pad;
- r_ptr->mexp = exp;
- r_ptr->next_exp = nextexp;
+ r_ptr->extra = (BIT_FLAGS16)pad;
+ r_ptr->mexp = (EXP)exp;
+ r_ptr->next_exp = (EXP)nextexp;
r_ptr->next_r_idx = (IDX)nextmon;
}
/* Scan for the values */
if (3 != sscanf(buf+2, "%d:%dd%d", &id, &dd, &ds)) return (1);
- r_ptr->reinforce_id[i] = id;
- r_ptr->reinforce_dd[i] = dd;
- r_ptr->reinforce_ds[i] = ds;
+ r_ptr->reinforce_id[i] = (MONRACE_IDX)id;
+ r_ptr->reinforce_dd[i] = (DICE_NUMBER)dd;
+ r_ptr->reinforce_ds[i] = (DICE_SID)ds;
}
/* Process 'B' for "Blows" (up to four lines) */
if (*t == 'd') *t++ = '\0';
/* Save the method */
- r_ptr->blow[i].method = n1;
+ r_ptr->blow[i].method = (BLOW_METHOD)n1;
/* Save the effect */
- r_ptr->blow[i].effect = n2;
+ r_ptr->blow[i].effect = (BLOW_EFFECT)n2;
/* Extract the damage dice and sides */
r_ptr->blow[i].d_dice = atoi(s);
if (i == 4) return (1);
if (3 != sscanf(buf+2, "%d:%d:%d", &id, &rarity, &per)) return (1);
- r_ptr->artifact_id[i] = id;
+ r_ptr->artifact_id[i] = (ARTIFACT_IDX)id;
r_ptr->artifact_rarity[i] = (RARITY)rarity;
r_ptr->artifact_percent[i] = (PERCENTAGE)per;
}
&min_lev, &max_lev, &min_plev, &mode, &min_alloc, &max_chance, &obj_good, &obj_great, (unsigned int *)&pit, (unsigned int *)&nest)) return (1);
/* Save the values */
- d_ptr->mindepth = min_lev;
- d_ptr->maxdepth = max_lev;
- d_ptr->min_plev = min_plev;
- d_ptr->mode = mode;
+ d_ptr->mindepth = (DEPTH)min_lev;
+ d_ptr->maxdepth = (DEPTH)max_lev;
+ d_ptr->min_plev = (PLAYER_LEVEL)min_plev;
+ d_ptr->mode = (BIT_FLAGS8)mode;
d_ptr->min_m_alloc_level = min_alloc;
d_ptr->max_m_alloc_chance = max_chance;
d_ptr->obj_good = obj_good;
d_ptr->obj_great = obj_great;
- d_ptr->pit = pit;
- d_ptr->nest = nest;
+ d_ptr->pit = (BIT_FLAGS16)pit;
+ d_ptr->nest = (BIT_FLAGS16)nest;
}
/* Process 'P' for "Place Info" */
d_ptr->floor[i].feat = f_tag_to_index(zz[i * 2]);
if (d_ptr->floor[i].feat < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
- d_ptr->floor[i].percent = atoi(zz[i * 2 + 1]);
+ d_ptr->floor[i].percent = (PERCENTAGE)atoi(zz[i * 2 + 1]);
}
d_ptr->tunnel_percent = atoi(zz[DUNGEON_FEAT_PROB_NUM * 2]);
}
d_ptr->fill[i].feat = f_tag_to_index(zz[i * 2]);
if (d_ptr->fill[i].feat < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
- d_ptr->fill[i].percent = atoi(zz[i * 2 + 1]);
+ d_ptr->fill[i].percent = (PERCENTAGE)atoi(zz[i * 2 + 1]);
}
d_ptr->outer_wall = f_tag_to_index(zz[DUNGEON_FEAT_PROB_NUM * 2]);
if (1 == sscanf(s, "FINAL_ARTIFACT_%d", &artif))
{
/* Extract a "Final Artifact" */
- d_ptr->final_artifact = artif;
+ d_ptr->final_artifact = (ARTIFACT_IDX)artif;
/* Start at next entry */
s = t;
if (1 == sscanf(s, "FINAL_OBJECT_%d", &artif))
{
/* Extract a "Final Artifact" */
- d_ptr->final_object = artif;
+ d_ptr->final_object = (KIND_OBJECT_IDX)artif;
/* Start at next entry */
s = t;
if (1 == sscanf(s, "FINAL_GUARDIAN_%d", &monst))
{
/* Extract a "Artifact Guardian" */
- d_ptr->final_guardian = monst;
+ d_ptr->final_guardian = (MONRACE_IDX)monst;
/* Start at next entry */
s = t;
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 */
};
strcpy(building[index].act_names[action_index], zz[1]);
/* Cost of the action for members */
- building[index].member_costs[action_index] = atoi(zz[2]);
+ building[index].member_costs[action_index] = (PRICE)atoi(zz[2]);
/* Cost of the action for non-members */
- building[index].other_costs[action_index] = atoi(zz[3]);
+ building[index].other_costs[action_index] = (PRICE)atoi(zz[3]);
/* Letter assigned to the action */
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;
}
{
for (i = 0; i < MAX_CLASS; i++)
{
- building[index].member_class[i] = atoi(zz[i]);
+ building[index].member_class[i] = (CLASS_IDX)atoi(zz[i]);
}
break;
{
for (i = 0; i < MAX_RACES; i++)
{
- building[index].member_race[i] = atoi(zz[i]);
+ building[index].member_race[i] = (RACE_IDX)atoi(zz[i]);
}
break;
{
for (i = 0; i < MAX_MAGIC; i++)
{
- building[index].member_realm[i+1] = atoi(zz[i]);
+ building[index].member_realm[i+1] = (REALM_IDX)atoi(zz[i]);
}
break;
if (num < 9) return (PARSE_ERROR_TOO_FEW_ARGUMENTS);
- q_ptr->type = atoi(zz[2]);
- q_ptr->num_mon = atoi(zz[3]);
- q_ptr->cur_num = atoi(zz[4]);
- q_ptr->max_num = atoi(zz[5]);
- q_ptr->level = atoi(zz[6]);
+ q_ptr->type = (QUEST_TYPE)atoi(zz[2]);
+ q_ptr->num_mon = (MONSTER_NUMBER)atoi(zz[3]);
+ q_ptr->cur_num = (MONSTER_NUMBER)atoi(zz[4]);
+ q_ptr->max_num = (MONSTER_NUMBER)atoi(zz[5]);
+ q_ptr->level = (DEPTH)atoi(zz[6]);
q_ptr->r_idx = (IDX)atoi(zz[7]);
q_ptr->k_idx = (IDX)atoi(zz[8]);
- q_ptr->dungeon = atoi(zz[9]);
+ 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 */
cptr desc;
- int mode = -1;
+ BIT_FLAGS mode = -1;
if (!fff) return;
OSDN Git Service
