• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision7cdb104ee79b818365e7871434e4050e221d63ae (tree)
Time2019-02-05 13:35:38
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 feat_*と命名を一致させるため fill_type を feat_wall_type に改名。 / Rename fill_type to feat_wall_type for consistent naming with feat_*.

Change Summary

Incremental Difference

--- a/src/cave.c
+++ b/src/cave.c
@@ -4600,7 +4600,7 @@ FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat)
46004600 case CONVERT_TYPE_FLOOR:
46014601 return feat_ground_type[randint0(100)];
46024602 case CONVERT_TYPE_WALL:
4603- return fill_type[randint0(100)];
4603+ return feat_wall_type[randint0(100)];
46044604 case CONVERT_TYPE_INNER:
46054605 return feat_wall_inner;
46064606 case CONVERT_TYPE_OUTER:
--- a/src/externs.h
+++ b/src/externs.h
@@ -445,7 +445,7 @@ extern DEPTH *max_dlv;
445445 extern FEAT_IDX feat_wall_outer;
446446 extern FEAT_IDX feat_wall_inner;
447447 extern FEAT_IDX feat_wall_solid;
448-extern FEAT_IDX feat_ground_type[100], fill_type[100];
448+extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];
449449 extern bool now_damaged;
450450 extern COMMAND_CODE now_message;
451451 extern bool use_menu;
--- a/src/grid.c
+++ b/src/grid.c
@@ -175,7 +175,7 @@ void place_random_door(POSITION y, POSITION x, bool room)
175175 if (type != DOOR_CURTAIN)
176176 {
177177 /* Hide. If on the edge of room, use outer wall. */
178- c_ptr->mimic = room ? feat_wall_outer : fill_type[randint0(100)];
178+ c_ptr->mimic = room ? feat_wall_outer : feat_wall_type[randint0(100)];
179179
180180 /* Floor type terrain cannot hide a door */
181181 if (feat_supports_los(c_ptr->mimic) && !feat_supports_los(c_ptr->feat))
--- a/src/grid.h
+++ b/src/grid.h
@@ -81,7 +81,7 @@
8181
8282 #define place_extra_bold(Y, X) \
8383 { \
84- set_cave_feat(Y,X,fill_type[randint0(100)]); \
84+ set_cave_feat(Y,X,feat_wall_type[randint0(100)]); \
8585 cave[Y][X].info &= ~(CAVE_MASK); \
8686 add_cave_info(Y,X,CAVE_EXTRA); \
8787 delete_monster(Y, X); \
@@ -89,7 +89,7 @@
8989
9090 #define place_extra_grid(C) \
9191 { \
92- (C)->feat = fill_type[randint0(100)]; \
92+ (C)->feat = feat_wall_type[randint0(100)]; \
9393 (C)->info &= ~(CAVE_MASK); \
9494 (C)->info |= CAVE_EXTRA; \
9595 if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
@@ -114,7 +114,7 @@
114114 #define place_extra_noperm_bold(Y, X) \
115115 { \
116116 feature_type *_f_ptr; \
117- set_cave_feat(Y,X,fill_type[randint0(100)]); \
117+ set_cave_feat(Y,X,feat_wall_type[randint0(100)]); \
118118 _f_ptr = &f_info[cave[Y][X].feat]; \
119119 if (permanent_wall(_f_ptr)) cave[Y][X].feat = feat_state(cave[Y][X].feat, FF_UNPERM); \
120120 cave[Y][X].info &= ~(CAVE_MASK); \
--- a/src/variable.c
+++ b/src/variable.c
@@ -956,7 +956,7 @@ DEPTH *max_dlv;
956956 FEAT_IDX feat_wall_outer;
957957 FEAT_IDX feat_wall_inner;
958958 FEAT_IDX feat_wall_solid;
959-FEAT_IDX feat_ground_type[100], fill_type[100];
959+FEAT_IDX feat_ground_type[100], feat_wall_type[100];
960960
961961 bool now_damaged;
962962 COMMAND_CODE now_message;
--- a/src/wild.c
+++ b/src/wild.c
@@ -57,7 +57,7 @@ void set_floor_and_wall(DUNGEON_IDX type)
5757 d_ptr = &d_info[type];
5858
5959 set_floor_and_wall_aux(feat_ground_type, d_ptr->floor);
60- set_floor_and_wall_aux(fill_type, d_ptr->fill);
60+ set_floor_and_wall_aux(feat_wall_type, d_ptr->fill);
6161
6262 feat_wall_outer = d_ptr->outer_wall;
6363 feat_wall_inner = d_ptr->inner_wall;
Show on old repository browser