• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision5ffa1a0dc029885f1e4fbec9d8816084c6f1519a (tree)
Time2019-05-13 21:02:08
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 feature_action_flags を grid.c へ移動.

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -43,8 +43,6 @@ extern const byte adj_con_fix[];
4343 extern const byte adj_con_mhp[];
4444 extern const byte adj_chr_chm[];
4545
46-extern const byte feature_action_flags[FF_FLAG_MAX];
47-
4846 /* variable.c */
4947
5048 extern COMMAND_CODE command_cmd;
--- a/src/grid.c
+++ b/src/grid.c
@@ -38,6 +38,131 @@
3838 #include "spells.h"
3939 #include "view-mainwindow.h"
4040
41+
42+/*!
43+ * @brief 地形状態フラグテーブル /
44+ * The table of features' actions
45+ */
46+static const byte feature_action_flags[FF_FLAG_MAX] =
47+{
48+ 0, /* LOS */
49+ 0, /* PROJECT */
50+ 0, /* MOVE */
51+ 0, /* PLACE */
52+ 0, /* DROP */
53+ 0, /* SECRET */
54+ 0, /* NOTICE */
55+ 0, /* REMEMBER */
56+ 0, /* OPEN */
57+ 0, /* CLOSE */
58+ FAF_CRASH_GLASS, /* BASH */
59+ 0, /* SPIKE */
60+ FAF_DESTROY, /* DISARM */
61+ 0, /* STORE */
62+ FAF_DESTROY | FAF_CRASH_GLASS, /* TUNNEL */
63+ 0, /* MAY_HAVE_GOLD */
64+ 0, /* HAS_GOLD */
65+ 0, /* HAS_ITEM */
66+ 0, /* DOOR */
67+ 0, /* TRAP */
68+ 0, /* STAIRS */
69+ 0, /* GLYPH */
70+ 0, /* LESS */
71+ 0, /* MORE */
72+ 0, /* RUN */
73+ 0, /* FLOOR */
74+ 0, /* WALL */
75+ 0, /* PERMANENT */
76+ 0, /* INNER */
77+ 0, /* OUTER */
78+ 0, /* SOLID */
79+ 0, /* HIT_TRAP */
80+
81+ 0, /* BRIDGE */
82+ 0, /* RIVER */
83+ 0, /* LAKE */
84+ 0, /* BRIDGED */
85+ 0, /* COVERED */
86+ 0, /* GLOW */
87+ 0, /* ENSECRET */
88+ 0, /* WATER */
89+ 0, /* LAVA */
90+ 0, /* SHALLOW */
91+ 0, /* DEEP */
92+ 0, /* FILLED */
93+ FAF_DESTROY | FAF_CRASH_GLASS, /* HURT_ROCK */
94+ 0, /* HURT_FIRE */
95+ 0, /* HURT_COLD */
96+ 0, /* HURT_ACID */
97+ 0, /* ICE */
98+ 0, /* ACID */
99+ 0, /* OIL */
100+ 0, /* XXX04 */
101+ 0, /* CAN_CLIMB */
102+ 0, /* CAN_FLY */
103+ 0, /* CAN_SWIM */
104+ 0, /* CAN_PASS */
105+ 0, /* CAN_OOZE */
106+ 0, /* CAN_DIG */
107+ 0, /* HIDE_ITEM */
108+ 0, /* HIDE_SNEAK */
109+ 0, /* HIDE_SWIM */
110+ 0, /* HIDE_DIG */
111+ 0, /* KILL_HUGE */
112+ 0, /* KILL_MOVE */
113+
114+ 0, /* PICK_TRAP */
115+ 0, /* PICK_DOOR */
116+ 0, /* ALLOC */
117+ 0, /* CHEST */
118+ 0, /* DROP_1D2 */
119+ 0, /* DROP_2D2 */
120+ 0, /* DROP_GOOD */
121+ 0, /* DROP_GREAT */
122+ 0, /* HURT_POIS */
123+ 0, /* HURT_ELEC */
124+ 0, /* HURT_WATER */
125+ 0, /* HURT_BWATER */
126+ 0, /* USE_FEAT */
127+ 0, /* GET_FEAT */
128+ 0, /* GROUND */
129+ 0, /* OUTSIDE */
130+ 0, /* EASY_HIDE */
131+ 0, /* EASY_CLIMB */
132+ 0, /* MUST_CLIMB */
133+ 0, /* TREE */
134+ 0, /* NEED_TREE */
135+ 0, /* BLOOD */
136+ 0, /* DUST */
137+ 0, /* SLIME */
138+ 0, /* PLANT */
139+ 0, /* XXX2 */
140+ 0, /* INSTANT */
141+ 0, /* EXPLODE */
142+ 0, /* TIMED */
143+ 0, /* ERUPT */
144+ 0, /* STRIKE */
145+ 0, /* SPREAD */
146+
147+ 0, /* SPECIAL */
148+ FAF_DESTROY | FAF_NO_DROP | FAF_CRASH_GLASS, /* HURT_DISI */
149+ 0, /* QUEST_ENTER */
150+ 0, /* QUEST_EXIT */
151+ 0, /* QUEST */
152+ 0, /* SHAFT */
153+ 0, /* MOUNTAIN */
154+ 0, /* BLDG */
155+ 0, /* MINOR_GLYPH */
156+ 0, /* PATTERN */
157+ 0, /* TOWN */
158+ 0, /* ENTRANCE */
159+ 0, /* MIRROR */
160+ 0, /* UNPERM */
161+ 0, /* TELEPORTABLE */
162+ 0, /* CONVERT */
163+ 0, /* GLASS */
164+};
165+
41166 /*!
42167 * @brief 新規フロアに入りたてのプレイヤーをランダムな場所に配置する / Returns random co-ordinates for player/monster/object
43168 * @return 配置に成功したらTRUEを返す
--- a/src/tables.c
+++ b/src/tables.c
@@ -952,128 +952,3 @@ const byte adj_chr_chm[] =
952952 81 /* 18/210-18/219 */,
953953 85 /* 18/220+ */
954954 };
955-
956-/*!
957- * @brief 地形状態フラグテーブル /
958- * The table of features' actions
959- */
960-const byte feature_action_flags[FF_FLAG_MAX] =
961-{
962- 0, /* LOS */
963- 0, /* PROJECT */
964- 0, /* MOVE */
965- 0, /* PLACE */
966- 0, /* DROP */
967- 0, /* SECRET */
968- 0, /* NOTICE */
969- 0, /* REMEMBER */
970- 0, /* OPEN */
971- 0, /* CLOSE */
972- FAF_CRASH_GLASS, /* BASH */
973- 0, /* SPIKE */
974- FAF_DESTROY, /* DISARM */
975- 0, /* STORE */
976- FAF_DESTROY | FAF_CRASH_GLASS, /* TUNNEL */
977- 0, /* MAY_HAVE_GOLD */
978- 0, /* HAS_GOLD */
979- 0, /* HAS_ITEM */
980- 0, /* DOOR */
981- 0, /* TRAP */
982- 0, /* STAIRS */
983- 0, /* GLYPH */
984- 0, /* LESS */
985- 0, /* MORE */
986- 0, /* RUN */
987- 0, /* FLOOR */
988- 0, /* WALL */
989- 0, /* PERMANENT */
990- 0, /* INNER */
991- 0, /* OUTER */
992- 0, /* SOLID */
993- 0, /* HIT_TRAP */
994-
995- 0, /* BRIDGE */
996- 0, /* RIVER */
997- 0, /* LAKE */
998- 0, /* BRIDGED */
999- 0, /* COVERED */
1000- 0, /* GLOW */
1001- 0, /* ENSECRET */
1002- 0, /* WATER */
1003- 0, /* LAVA */
1004- 0, /* SHALLOW */
1005- 0, /* DEEP */
1006- 0, /* FILLED */
1007- FAF_DESTROY | FAF_CRASH_GLASS, /* HURT_ROCK */
1008- 0, /* HURT_FIRE */
1009- 0, /* HURT_COLD */
1010- 0, /* HURT_ACID */
1011- 0, /* ICE */
1012- 0, /* ACID */
1013- 0, /* OIL */
1014- 0, /* XXX04 */
1015- 0, /* CAN_CLIMB */
1016- 0, /* CAN_FLY */
1017- 0, /* CAN_SWIM */
1018- 0, /* CAN_PASS */
1019- 0, /* CAN_OOZE */
1020- 0, /* CAN_DIG */
1021- 0, /* HIDE_ITEM */
1022- 0, /* HIDE_SNEAK */
1023- 0, /* HIDE_SWIM */
1024- 0, /* HIDE_DIG */
1025- 0, /* KILL_HUGE */
1026- 0, /* KILL_MOVE */
1027-
1028- 0, /* PICK_TRAP */
1029- 0, /* PICK_DOOR */
1030- 0, /* ALLOC */
1031- 0, /* CHEST */
1032- 0, /* DROP_1D2 */
1033- 0, /* DROP_2D2 */
1034- 0, /* DROP_GOOD */
1035- 0, /* DROP_GREAT */
1036- 0, /* HURT_POIS */
1037- 0, /* HURT_ELEC */
1038- 0, /* HURT_WATER */
1039- 0, /* HURT_BWATER */
1040- 0, /* USE_FEAT */
1041- 0, /* GET_FEAT */
1042- 0, /* GROUND */
1043- 0, /* OUTSIDE */
1044- 0, /* EASY_HIDE */
1045- 0, /* EASY_CLIMB */
1046- 0, /* MUST_CLIMB */
1047- 0, /* TREE */
1048- 0, /* NEED_TREE */
1049- 0, /* BLOOD */
1050- 0, /* DUST */
1051- 0, /* SLIME */
1052- 0, /* PLANT */
1053- 0, /* XXX2 */
1054- 0, /* INSTANT */
1055- 0, /* EXPLODE */
1056- 0, /* TIMED */
1057- 0, /* ERUPT */
1058- 0, /* STRIKE */
1059- 0, /* SPREAD */
1060-
1061- 0, /* SPECIAL */
1062- FAF_DESTROY | FAF_NO_DROP | FAF_CRASH_GLASS, /* HURT_DISI */
1063- 0, /* QUEST_ENTER */
1064- 0, /* QUEST_EXIT */
1065- 0, /* QUEST */
1066- 0, /* SHAFT */
1067- 0, /* MOUNTAIN */
1068- 0, /* BLDG */
1069- 0, /* MINOR_GLYPH */
1070- 0, /* PATTERN */
1071- 0, /* TOWN */
1072- 0, /* ENTRANCE */
1073- 0, /* MIRROR */
1074- 0, /* UNPERM */
1075- 0, /* TELEPORTABLE */
1076- 0, /* CONVERT */
1077- 0, /* GLASS */
1078-};
1079-
Show on old repository browser