From 6d318ad3ebf1b03cd4599c8a0cbd85ab92ed3e19 Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 17 Apr 2019 22:59:00 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20cmd2.c=20=E3=82=92=20cmd-b?= =?utf8?q?asic.c/h=E3=80=80=E3=81=AB=E6=95=B4=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Hengband_vcs2017/Hengband/Hengband.vcxproj | 3 +- Hengband_vcs2017/Hengband/Hengband.vcxproj.filters | 9 ++++-- src/cmd-activate.c | 1 + src/{cmd2.c => cmd-basic.c} | 2 ++ src/cmd-basic.h | 32 ++++++++++++++++++++++ src/cmd-hissatsu.c | 2 ++ src/cmd-item.c | 1 + src/cmd-magiceat.c | 1 + src/cmd-mane.c | 1 + src/cmd-pet.c | 1 + src/cmd-quaff.c | 1 + src/cmd-read.c | 2 ++ src/cmd-smith.c | 1 + src/cmd-spell.c | 1 + src/cmd-usestaff.c | 1 + src/cmd-zaprod.c | 1 + src/cmd-zapwand.c | 1 + src/dungeon.c | 1 + src/externs.h | 32 ---------------------- src/floor-save.c | 1 + src/mind.c | 1 + src/mspells3.c | 1 + src/mutation.c | 1 + src/player-move.c | 1 + src/racial.c | 1 + src/realm-hissatsu.c | 1 + src/snipe.c | 1 + src/spells-floor.c | 1 + 28 files changed, 67 insertions(+), 36 deletions(-) rename src/{cmd2.c => cmd-basic.c} (99%) create mode 100644 src/cmd-basic.h diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index ebeb53b80..ee425c6e2 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -142,6 +142,7 @@ + @@ -184,6 +185,7 @@ + @@ -196,7 +198,6 @@ CppCode - diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index 28adf949f..273820d78 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -60,9 +60,6 @@ - - cmd - cmd @@ -258,6 +255,9 @@ object + + cmd + @@ -466,6 +466,9 @@ cmd + + cmd + diff --git a/src/cmd-activate.c b/src/cmd-activate.c index 3d7a372f7..9d8fd92f8 100644 --- a/src/cmd-activate.c +++ b/src/cmd-activate.c @@ -8,6 +8,7 @@ #include "angband.h" #include "cmd-activate.h" +#include "cmd-basic.h" #include "floor.h" #include "object-hook.h" #include "sort.h" diff --git a/src/cmd2.c b/src/cmd-basic.c similarity index 99% rename from src/cmd2.c rename to src/cmd-basic.c index 98c23e233..775e3830d 100644 --- a/src/cmd2.c +++ b/src/cmd-basic.c @@ -33,6 +33,8 @@ #include "object-flavor.h" #include "shoot.h" +#include "cmd-basic.h" + /*! * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理 * @param down_stair TRUEならば階段を降りる処理、FALSEなら階段を昇る処理による内容 diff --git a/src/cmd-basic.h b/src/cmd-basic.h new file mode 100644 index 000000000..2d54d27f5 --- /dev/null +++ b/src/cmd-basic.h @@ -0,0 +1,32 @@ +#pragma once +/* cmd2.c */ +extern bool cmd_limit_cast(player_type *creature_ptr); +extern bool cmd_limit_arena(player_type *creature_ptr); +extern bool cmd_limit_time_walk(player_type *creature_ptr); +extern bool cmd_limit_blind(player_type *creature_ptr); +extern bool cmd_limit_confused(player_type *creature_ptr); +extern bool cmd_limit_image(player_type *creature_ptr); +extern bool cmd_limit_stun(player_type *creature_ptr); +extern void forget_travel_flow(void); +extern void do_cmd_go_up(void); +extern void do_cmd_go_down(void); +extern void do_cmd_search(void); +extern void do_cmd_open(void); +extern void do_cmd_close(void); +extern void do_cmd_tunnel(void); +extern void do_cmd_disarm(void); +extern void do_cmd_bash(void); +extern void do_cmd_alter(void); +extern void do_cmd_spike(void); +extern void do_cmd_walk(bool pickup); +extern void do_cmd_stay(bool pickup); +extern void do_cmd_run(void); +extern void do_cmd_rest(void); +extern void do_cmd_fire(SPELL_IDX snipe_type); +extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr, SPELL_IDX snipe_type); +extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken); +#ifdef TRAVEL +extern void do_cmd_travel(void); +#endif +extern bool easy_open_door(POSITION y, POSITION x); +extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir); diff --git a/src/cmd-hissatsu.c b/src/cmd-hissatsu.c index 64e0e6f18..7447f8ea5 100644 --- a/src/cmd-hissatsu.c +++ b/src/cmd-hissatsu.c @@ -14,6 +14,8 @@ #include "monsterrace-hook.h" #include "player-status.h" +#include "cmd-basic.h" + #define TECHNIC_HISSATSU (REALM_HISSATSU - MIN_TECHNIC) diff --git a/src/cmd-item.c b/src/cmd-item.c index 01b9c5cd9..08ac32dce 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -21,6 +21,7 @@ #include "cmd-zaprod.h" #include "cmd-zapwand.h" #include "cmd-pet.h" +#include "cmd-basic.h" #include "object-flavor.h" #include "object-hook.h" diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c index 3ae7aaef9..f27723331 100644 --- a/src/cmd-magiceat.c +++ b/src/cmd-magiceat.c @@ -53,6 +53,7 @@ */ #include "angband.h" +#include "cmd-basic.h" #include "cmd-usestaff.h" #include "cmd-zaprod.h" #include "cmd-zapwand.h" diff --git a/src/cmd-mane.c b/src/cmd-mane.c index dc1d44243..ffc941d42 100644 --- a/src/cmd-mane.c +++ b/src/cmd-mane.c @@ -19,6 +19,7 @@ #include "monster-spell.h" #include "cmd-spell.h" #include "player-status.h" +#include "cmd-basic.h" static int damage; diff --git a/src/cmd-pet.c b/src/cmd-pet.c index 1a2a2e7c7..ccbe47437 100644 --- a/src/cmd-pet.c +++ b/src/cmd-pet.c @@ -9,6 +9,7 @@ #include "monster.h" #include "monster-status.h" #include "cmd-pet.h" +#include "cmd-basic.h" /*! * @brief プレイヤーの騎乗/下馬処理判定 diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c index 45953a281..fa2fad9fe 100644 --- a/src/cmd-quaff.c +++ b/src/cmd-quaff.c @@ -16,6 +16,7 @@ #include "realm-hex.h" #include "spells-floor.h" #include "object-broken.h" +#include "cmd-basic.h" /*! * @brief 薬を飲むコマンドのサブルーチン / diff --git a/src/cmd-read.c b/src/cmd-read.c index 4d21602f8..4bb9ccfd7 100644 --- a/src/cmd-read.c +++ b/src/cmd-read.c @@ -21,6 +21,8 @@ #include "spells-summon.h" #include "spells-status.h" +#include "cmd-basic.h" + /*! * @brief 巻物を読むコマンドのサブルーチン * Read a scroll (from the pack or floor). diff --git a/src/cmd-smith.c b/src/cmd-smith.c index 78da7b579..5b701fba0 100644 --- a/src/cmd-smith.c +++ b/src/cmd-smith.c @@ -2,6 +2,7 @@ #include "object-flavor.h" #include "object-hook.h" #include "player-status.h" +#include "cmd-basic.h" diff --git a/src/cmd-spell.c b/src/cmd-spell.c index 99e92360f..a20259e4a 100644 --- a/src/cmd-spell.c +++ b/src/cmd-spell.c @@ -26,6 +26,7 @@ #include "avatar.h" #include "player-status.h" #include "object-hook.h" +#include "cmd-basic.h" /*! * @brief diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c index 66dc18fed..2e12b63f7 100644 --- a/src/cmd-usestaff.c +++ b/src/cmd-usestaff.c @@ -4,6 +4,7 @@ #include "player-status.h" #include "spells-status.h" #include "object-hook.h" +#include "cmd-basic.h" diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c index 862bb60d4..557176228 100644 --- a/src/cmd-zaprod.c +++ b/src/cmd-zaprod.c @@ -4,6 +4,7 @@ #include "player-status.h" #include "object-hook.h" #include "spells.h" +#include "cmd-basic.h" /*! * @brief ロッドの効果を発動する diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c index 6528b76b1..062051e46 100644 --- a/src/cmd-zapwand.c +++ b/src/cmd-zapwand.c @@ -4,6 +4,7 @@ #include "spells-status.h" #include "player-status.h" #include "object-hook.h" +#include "cmd-basic.h" /*! diff --git a/src/dungeon.c b/src/dungeon.c index cc2312a5b..a559f6145 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -24,6 +24,7 @@ #include "cmd-zaprod.h" #include "cmd-zapwand.h" #include "cmd-pet.h" +#include "cmd-basic.h" #include "floor.h" #include "floor-events.h" #include "grid.h" diff --git a/src/externs.h b/src/externs.h index a60f7be56..9e40712d3 100644 --- a/src/externs.h +++ b/src/externs.h @@ -459,38 +459,6 @@ extern bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, POSITION y, POSITI extern bool cave_player_teleportable_bold(POSITION y, POSITION x, BIT_FLAGS mode); extern bool is_open(FEAT_IDX feat); -/* cmd2.c */ -extern bool cmd_limit_cast(player_type *creature_ptr); -extern bool cmd_limit_arena(player_type *creature_ptr); -extern bool cmd_limit_time_walk(player_type *creature_ptr); -extern bool cmd_limit_blind(player_type *creature_ptr); -extern bool cmd_limit_confused(player_type *creature_ptr); -extern bool cmd_limit_image(player_type *creature_ptr); -extern bool cmd_limit_stun(player_type *creature_ptr); -extern void forget_travel_flow(void); -extern void do_cmd_go_up(void); -extern void do_cmd_go_down(void); -extern void do_cmd_search(void); -extern void do_cmd_open(void); -extern void do_cmd_close(void); -extern void do_cmd_tunnel(void); -extern void do_cmd_disarm(void); -extern void do_cmd_bash(void); -extern void do_cmd_alter(void); -extern void do_cmd_spike(void); -extern void do_cmd_walk(bool pickup); -extern void do_cmd_stay(bool pickup); -extern void do_cmd_run(void); -extern void do_cmd_rest(void); -extern void do_cmd_fire(SPELL_IDX snipe_type); -extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr, SPELL_IDX snipe_type); -extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken); -#ifdef TRAVEL -extern void do_cmd_travel(void); -#endif -extern bool easy_open_door(POSITION y, POSITION x); -extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir); - /* cmd4.c */ #ifndef JP extern concptr get_ordinal_number_suffix(int num); diff --git a/src/floor-save.c b/src/floor-save.c index 6d521b994..78c771fd3 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -21,6 +21,7 @@ #include "monster-status.h" #include "object-hook.h" #include "cmd-pet.h" +#include "cmd-basic.h" static FLOOR_IDX new_floor_id; /*!<次のフロアのID / floor_id of the destination */ static u32b change_floor_mode; /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */ diff --git a/src/mind.c b/src/mind.c index 21b033927..e0909828c 100644 --- a/src/mind.c +++ b/src/mind.c @@ -27,6 +27,7 @@ #include "spells-floor.h" #include "feature.h" #include "grid.h" +#include "cmd-basic.h" /*! 特殊技能の一覧テーブル */ mind_power const mind_powers[5] = diff --git a/src/mspells3.c b/src/mspells3.c index ba2f69530..3648b3cce 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -20,6 +20,7 @@ #include "player-status.h" #include "monster-spell.h" #include "spells.h" +#include "cmd-basic.h" #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130) /*!< モンスター魔法をプレイヤーが使用する場合の換算レベル */ diff --git a/src/mutation.c b/src/mutation.c index b347d65a0..b1fde4e60 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -21,6 +21,7 @@ #include "spells-status.h" #include "object-hook.h" #include "spells.h" +#include "cmd-basic.h" /*! * @brief プレイヤーに突然変異を与える diff --git a/src/player-move.c b/src/player-move.c index b4978e65f..e1709940a 100644 --- a/src/player-move.c +++ b/src/player-move.c @@ -156,6 +156,7 @@ #include "object-hook.h" #include "object-flavor.h" #include "spells.h" +#include "cmd-basic.h" diff --git a/src/racial.c b/src/racial.c index fff162177..f4fde65f7 100644 --- a/src/racial.c +++ b/src/racial.c @@ -11,6 +11,7 @@ */ #include "angband.h" +#include "cmd-basic.h" #include "cmd-magiceat.h" #include "cmd-mane.h" #include "cmd-zapwand.h" diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c index 474f17b03..0ef87c92b 100644 --- a/src/realm-hissatsu.c +++ b/src/realm-hissatsu.c @@ -1,5 +1,6 @@ #include "angband.h" #include "cmd-spell.h" +#include "cmd-basic.h" #include "floor.h" #include "melee.h" #include "monsterrace-hook.h" diff --git a/src/snipe.c b/src/snipe.c index cd65ddb75..d9f7ae4c2 100644 --- a/src/snipe.c +++ b/src/snipe.c @@ -8,6 +8,7 @@ #include "angband.h" #include "player-status.h" +#include "cmd-basic.h" #define MAX_SNIPE_POWERS 16 diff --git a/src/spells-floor.c b/src/spells-floor.c index 558e3098e..de9a2dc30 100644 --- a/src/spells-floor.c +++ b/src/spells-floor.c @@ -3,6 +3,7 @@ #include "spells-floor.h" #include "grid.h" #include "quest.h" +#include "cmd-basic.h" /* * Light up the dungeon using "clairvoyance" -- 2.11.0