switch (f_ptr->subtype)
{
case CONVERT_TYPE_FLOOR:
- return floor_type[randint0(100)];
+ return feat_ground_type[randint0(100)];
case CONVERT_TYPE_WALL:
return fill_type[randint0(100)];
case CONVERT_TYPE_INNER:
extern FEAT_IDX feat_wall_outer;
extern FEAT_IDX feat_wall_inner;
extern FEAT_IDX feat_wall_solid;
-extern FEAT_IDX floor_type[100], fill_type[100];
+extern FEAT_IDX feat_ground_type[100], fill_type[100];
extern bool now_damaged;
extern COMMAND_CODE now_message;
extern bool use_menu;
if (change_floor_mode & (CFM_DOWN | CFM_UP))
{
/* Reset to floor */
- c_ptr->feat = floor_type[randint0(100)];
+ c_ptr->feat = feat_ground_type[randint0(100)];
}
c_ptr->special = 0;
/* Remove old stairs */
c_ptr->special = 0;
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, feat_ground_type[randint0(100)]);
}
}
}
{
if (have_flag(f_info[c_ptr->mimic].flags, FF_MOVE) || have_flag(f_info[c_ptr->mimic].flags, FF_CAN_FLY))
{
- c_ptr->feat = one_in_(2) ? c_ptr->mimic : floor_type[randint0(100)];
+ c_ptr->feat = one_in_(2) ? c_ptr->mimic : feat_ground_type[randint0(100)];
}
c_ptr->mimic = 0;
}
{
if (have_flag(f_info[c_ptr->mimic].flags, FF_MOVE) || have_flag(f_info[c_ptr->mimic].flags, FF_CAN_FLY))
{
- c_ptr->feat = one_in_(2) ? c_ptr->mimic : floor_type[randint0(100)];
+ c_ptr->feat = one_in_(2) ? c_ptr->mimic : feat_ground_type[randint0(100)];
}
c_ptr->mimic = 0;
}
#define place_floor_bold(Y, X) \
{ \
- set_cave_feat(Y,X,floor_type[randint0(100)]); \
+ set_cave_feat(Y,X,feat_ground_type[randint0(100)]); \
cave[Y][X].info &= ~(CAVE_MASK); \
add_cave_info(Y,X,CAVE_FLOOR); \
delete_monster(Y, X); \
#define place_floor_grid(C) \
{ \
- (C)->feat = floor_type[randint0(100)]; \
+ (C)->feat = feat_ground_type[randint0(100)]; \
(C)->info &= ~(CAVE_MASK); \
(C)->info |= CAVE_FLOOR; \
if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
fill_data.c3 = 0;
/* features to fill with */
- fill_data.feat1 = floor_type[randint0(100)];
- fill_data.feat2 = floor_type[randint0(100)];
- fill_data.feat3 = floor_type[randint0(100)];
+ fill_data.feat1 = feat_ground_type[randint0(100)];
+ fill_data.feat2 = feat_ground_type[randint0(100)];
+ fill_data.feat3 = feat_ground_type[randint0(100)];
fill_data.info1 = CAVE_FLOOR;
fill_data.info2 = CAVE_FLOOR;
case LAKE_T_LAVA: /* Lava */
feat1 = feat_deep_lava;
feat2 = feat_shallow_lava;
- feat3 = floor_type[randint0(100)];
+ feat3 = feat_ground_type[randint0(100)];
break;
case LAKE_T_WATER: /* Water */
feat1 = feat_deep_water;
feat2 = feat_shallow_water;
- feat3 = floor_type[randint0(100)];
+ feat3 = feat_ground_type[randint0(100)];
break;
case LAKE_T_CAVE: /* Collapsed cave */
- feat1 = floor_type[randint0(100)];
- feat2 = floor_type[randint0(100)];
+ feat1 = feat_ground_type[randint0(100)];
+ feat2 = feat_ground_type[randint0(100)];
feat3 = feat_rubble;
break;
case LAKE_T_EARTH_VAULT: /* Earth vault */
feat1 = feat_rubble;
- feat2 = floor_type[randint0(100)];
+ feat2 = feat_ground_type[randint0(100)];
feat3 = feat_rubble;
break;
case LAKE_T_AIR_VAULT: /* Air vault */
else
{
/* Create floor */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, feat_ground_type[randint0(100)]);
}
}
else /* In generation */
else
{
/* Create floor */
- cave_set_feat(yy, xx, floor_type[randint0(100)]);
+ cave_set_feat(yy, xx, feat_ground_type[randint0(100)]);
}
}
}
FEAT_IDX feat_wall_outer;
FEAT_IDX feat_wall_inner;
FEAT_IDX feat_wall_solid;
-FEAT_IDX floor_type[100], fill_type[100];
+FEAT_IDX feat_ground_type[100], fill_type[100];
bool now_damaged;
COMMAND_CODE now_message;
cur_type = type;
d_ptr = &d_info[type];
- set_floor_and_wall_aux(floor_type, d_ptr->floor);
+ set_floor_and_wall_aux(feat_ground_type, d_ptr->floor);
set_floor_and_wall_aux(fill_type, d_ptr->fill);
feat_wall_outer = d_ptr->outer_wall;