From 5ffa1a0dc029885f1e4fbec9d8816084c6f1519a Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 13 May 2019 21:02:08 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20feature=5Faction=5Fflags?= =?utf8?q?=20=E3=82=92=20grid.c=20=E3=81=B8=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 2 - src/grid.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/tables.c | 125 ---------------------------------------------------------- 3 files changed, 125 insertions(+), 127 deletions(-) diff --git a/src/externs.h b/src/externs.h index f39ce5e29..8cf1d3483 100644 --- a/src/externs.h +++ b/src/externs.h @@ -43,8 +43,6 @@ extern const byte adj_con_fix[]; extern const byte adj_con_mhp[]; extern const byte adj_chr_chm[]; -extern const byte feature_action_flags[FF_FLAG_MAX]; - /* variable.c */ extern COMMAND_CODE command_cmd; diff --git a/src/grid.c b/src/grid.c index bb245f7c6..66be68097 100644 --- a/src/grid.c +++ b/src/grid.c @@ -38,6 +38,131 @@ #include "spells.h" #include "view-mainwindow.h" + +/*! + * @brief 地形状態フラグテーブル / + * The table of features' actions + */ +static const byte feature_action_flags[FF_FLAG_MAX] = +{ + 0, /* LOS */ + 0, /* PROJECT */ + 0, /* MOVE */ + 0, /* PLACE */ + 0, /* DROP */ + 0, /* SECRET */ + 0, /* NOTICE */ + 0, /* REMEMBER */ + 0, /* OPEN */ + 0, /* CLOSE */ + FAF_CRASH_GLASS, /* BASH */ + 0, /* SPIKE */ + FAF_DESTROY, /* DISARM */ + 0, /* STORE */ + FAF_DESTROY | FAF_CRASH_GLASS, /* TUNNEL */ + 0, /* MAY_HAVE_GOLD */ + 0, /* HAS_GOLD */ + 0, /* HAS_ITEM */ + 0, /* DOOR */ + 0, /* TRAP */ + 0, /* STAIRS */ + 0, /* GLYPH */ + 0, /* LESS */ + 0, /* MORE */ + 0, /* RUN */ + 0, /* FLOOR */ + 0, /* WALL */ + 0, /* PERMANENT */ + 0, /* INNER */ + 0, /* OUTER */ + 0, /* SOLID */ + 0, /* HIT_TRAP */ + + 0, /* BRIDGE */ + 0, /* RIVER */ + 0, /* LAKE */ + 0, /* BRIDGED */ + 0, /* COVERED */ + 0, /* GLOW */ + 0, /* ENSECRET */ + 0, /* WATER */ + 0, /* LAVA */ + 0, /* SHALLOW */ + 0, /* DEEP */ + 0, /* FILLED */ + FAF_DESTROY | FAF_CRASH_GLASS, /* HURT_ROCK */ + 0, /* HURT_FIRE */ + 0, /* HURT_COLD */ + 0, /* HURT_ACID */ + 0, /* ICE */ + 0, /* ACID */ + 0, /* OIL */ + 0, /* XXX04 */ + 0, /* CAN_CLIMB */ + 0, /* CAN_FLY */ + 0, /* CAN_SWIM */ + 0, /* CAN_PASS */ + 0, /* CAN_OOZE */ + 0, /* CAN_DIG */ + 0, /* HIDE_ITEM */ + 0, /* HIDE_SNEAK */ + 0, /* HIDE_SWIM */ + 0, /* HIDE_DIG */ + 0, /* KILL_HUGE */ + 0, /* KILL_MOVE */ + + 0, /* PICK_TRAP */ + 0, /* PICK_DOOR */ + 0, /* ALLOC */ + 0, /* CHEST */ + 0, /* DROP_1D2 */ + 0, /* DROP_2D2 */ + 0, /* DROP_GOOD */ + 0, /* DROP_GREAT */ + 0, /* HURT_POIS */ + 0, /* HURT_ELEC */ + 0, /* HURT_WATER */ + 0, /* HURT_BWATER */ + 0, /* USE_FEAT */ + 0, /* GET_FEAT */ + 0, /* GROUND */ + 0, /* OUTSIDE */ + 0, /* EASY_HIDE */ + 0, /* EASY_CLIMB */ + 0, /* MUST_CLIMB */ + 0, /* TREE */ + 0, /* NEED_TREE */ + 0, /* BLOOD */ + 0, /* DUST */ + 0, /* SLIME */ + 0, /* PLANT */ + 0, /* XXX2 */ + 0, /* INSTANT */ + 0, /* EXPLODE */ + 0, /* TIMED */ + 0, /* ERUPT */ + 0, /* STRIKE */ + 0, /* SPREAD */ + + 0, /* SPECIAL */ + FAF_DESTROY | FAF_NO_DROP | FAF_CRASH_GLASS, /* HURT_DISI */ + 0, /* QUEST_ENTER */ + 0, /* QUEST_EXIT */ + 0, /* QUEST */ + 0, /* SHAFT */ + 0, /* MOUNTAIN */ + 0, /* BLDG */ + 0, /* MINOR_GLYPH */ + 0, /* PATTERN */ + 0, /* TOWN */ + 0, /* ENTRANCE */ + 0, /* MIRROR */ + 0, /* UNPERM */ + 0, /* TELEPORTABLE */ + 0, /* CONVERT */ + 0, /* GLASS */ +}; + /*! * @brief 新規フロアに入りたてのプレイヤーをランダムな場所に配置する / Returns random co-ordinates for player/monster/object * @return 配置に成功したらTRUEを返す diff --git a/src/tables.c b/src/tables.c index 52f36328f..f597153c8 100644 --- a/src/tables.c +++ b/src/tables.c @@ -952,128 +952,3 @@ const byte adj_chr_chm[] = 81 /* 18/210-18/219 */, 85 /* 18/220+ */ }; - -/*! - * @brief 地形状態フラグテーブル / - * The table of features' actions - */ -const byte feature_action_flags[FF_FLAG_MAX] = -{ - 0, /* LOS */ - 0, /* PROJECT */ - 0, /* MOVE */ - 0, /* PLACE */ - 0, /* DROP */ - 0, /* SECRET */ - 0, /* NOTICE */ - 0, /* REMEMBER */ - 0, /* OPEN */ - 0, /* CLOSE */ - FAF_CRASH_GLASS, /* BASH */ - 0, /* SPIKE */ - FAF_DESTROY, /* DISARM */ - 0, /* STORE */ - FAF_DESTROY | FAF_CRASH_GLASS, /* TUNNEL */ - 0, /* MAY_HAVE_GOLD */ - 0, /* HAS_GOLD */ - 0, /* HAS_ITEM */ - 0, /* DOOR */ - 0, /* TRAP */ - 0, /* STAIRS */ - 0, /* GLYPH */ - 0, /* LESS */ - 0, /* MORE */ - 0, /* RUN */ - 0, /* FLOOR */ - 0, /* WALL */ - 0, /* PERMANENT */ - 0, /* INNER */ - 0, /* OUTER */ - 0, /* SOLID */ - 0, /* HIT_TRAP */ - - 0, /* BRIDGE */ - 0, /* RIVER */ - 0, /* LAKE */ - 0, /* BRIDGED */ - 0, /* COVERED */ - 0, /* GLOW */ - 0, /* ENSECRET */ - 0, /* WATER */ - 0, /* LAVA */ - 0, /* SHALLOW */ - 0, /* DEEP */ - 0, /* FILLED */ - FAF_DESTROY | FAF_CRASH_GLASS, /* HURT_ROCK */ - 0, /* HURT_FIRE */ - 0, /* HURT_COLD */ - 0, /* HURT_ACID */ - 0, /* ICE */ - 0, /* ACID */ - 0, /* OIL */ - 0, /* XXX04 */ - 0, /* CAN_CLIMB */ - 0, /* CAN_FLY */ - 0, /* CAN_SWIM */ - 0, /* CAN_PASS */ - 0, /* CAN_OOZE */ - 0, /* CAN_DIG */ - 0, /* HIDE_ITEM */ - 0, /* HIDE_SNEAK */ - 0, /* HIDE_SWIM */ - 0, /* HIDE_DIG */ - 0, /* KILL_HUGE */ - 0, /* KILL_MOVE */ - - 0, /* PICK_TRAP */ - 0, /* PICK_DOOR */ - 0, /* ALLOC */ - 0, /* CHEST */ - 0, /* DROP_1D2 */ - 0, /* DROP_2D2 */ - 0, /* DROP_GOOD */ - 0, /* DROP_GREAT */ - 0, /* HURT_POIS */ - 0, /* HURT_ELEC */ - 0, /* HURT_WATER */ - 0, /* HURT_BWATER */ - 0, /* USE_FEAT */ - 0, /* GET_FEAT */ - 0, /* GROUND */ - 0, /* OUTSIDE */ - 0, /* EASY_HIDE */ - 0, /* EASY_CLIMB */ - 0, /* MUST_CLIMB */ - 0, /* TREE */ - 0, /* NEED_TREE */ - 0, /* BLOOD */ - 0, /* DUST */ - 0, /* SLIME */ - 0, /* PLANT */ - 0, /* XXX2 */ - 0, /* INSTANT */ - 0, /* EXPLODE */ - 0, /* TIMED */ - 0, /* ERUPT */ - 0, /* STRIKE */ - 0, /* SPREAD */ - - 0, /* SPECIAL */ - FAF_DESTROY | FAF_NO_DROP | FAF_CRASH_GLASS, /* HURT_DISI */ - 0, /* QUEST_ENTER */ - 0, /* QUEST_EXIT */ - 0, /* QUEST */ - 0, /* SHAFT */ - 0, /* MOUNTAIN */ - 0, /* BLDG */ - 0, /* MINOR_GLYPH */ - 0, /* PATTERN */ - 0, /* TOWN */ - 0, /* ENTRANCE */ - 0, /* MIRROR */ - 0, /* UNPERM */ - 0, /* TELEPORTABLE */ - 0, /* CONVERT */ - 0, /* GLASS */ -}; - -- 2.11.0