From 188488293d5afb53a6c20dda31feafb844af35d9 Mon Sep 17 00:00:00 2001 From: deskull Date: Fri, 3 May 2019 12:44:15 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20cmd4.c=E3=80=80=E3=82=92?= =?utf8?q?=20cmd-dump.c=20=E3=81=AB=E6=94=B9=E5=90=8D=E3=81=97=E3=81=A6?= =?utf8?q?=E9=96=A2=E6=95=B0=E6=95=B4=E7=90=86=EF=BC=8E?= 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/Makefile.am | 2 +- src/birth.c | 1 + src/bldg.c | 1 + src/chuukei.c | 1 + src/cmd-basic.c | 1 + src/{cmd4.c => cmd-dump.c} | 2 ++ src/cmd-dump.h | 32 ++++++++++++++++++++++ src/cmd-pet.c | 1 + src/cmd-spell.c | 1 + src/core.c | 1 + src/externs.h | 30 -------------------- src/files.c | 1 + src/floor-events.c | 1 + src/floor-generate.c | 1 + src/floor-save.c | 1 + src/main-win.c | 1 + src/monster-process.c | 1 + src/monster-status.c | 1 + src/monster1.c | 1 + src/monster2.c | 1 + src/mutation.c | 1 + src/object2.c | 1 + src/patron.c | 1 + src/player-effects.c | 1 + src/player-status.c | 1 + src/quest.c | 1 + src/scores.c | 1 + src/spells1.c | 1 + src/spells2.c | 1 + src/spells3.c | 1 + src/store.c | 1 + src/trap.c | 1 + src/util.c | 1 + src/wizard2.c | 1 + 36 files changed, 73 insertions(+), 35 deletions(-) rename src/{cmd4.c => cmd-dump.c} (99%) create mode 100644 src/cmd-dump.h diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index 84f264a77..bf33ffae7 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -143,6 +143,7 @@ + @@ -204,6 +205,7 @@ + @@ -217,7 +219,6 @@ - diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index a638c0e05..f3e668f73 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -31,9 +31,6 @@ - - cmd - cmd @@ -345,6 +342,9 @@ player + + cmd + @@ -655,6 +655,9 @@ player + + cmd + diff --git a/src/Makefile.am b/src/Makefile.am index c736775ee..5d9468b2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ hengband_SOURCES = \ avatar.h avatar.c birth.c birth.h \ \ bldg.c bldg.h chest.c chest.h chuukei.c \ - cmd-basic.c cmd-basic.h cmd4.c cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \ + cmd-basic.c cmd-basic.h cmd-dump.c cmd-dump.h cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \ cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \ cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h \ cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \ diff --git a/src/birth.c b/src/birth.c index c239e9117..194d82b3f 100644 --- a/src/birth.c +++ b/src/birth.c @@ -17,6 +17,7 @@ #include "artifact.h" #include "avatar.h" +#include "cmd-dump.h" #include "history.h" #include "monsterrace-hook.h" #include "store.h" diff --git a/src/bldg.c b/src/bldg.c index ae498f28d..8c0dbe6b1 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -15,6 +15,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "floor.h" #include "floor-events.h" #include "floor-save.h" diff --git a/src/chuukei.c b/src/chuukei.c index 1dfbf4173..af4b6cdf1 100644 --- a/src/chuukei.c +++ b/src/chuukei.c @@ -9,6 +9,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include #include diff --git a/src/cmd-basic.c b/src/cmd-basic.c index 620e891ce..93fb8043e 100644 --- a/src/cmd-basic.c +++ b/src/cmd-basic.c @@ -13,6 +13,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "chest.h" #include "trap.h" #include "dungeon.h" diff --git a/src/cmd4.c b/src/cmd-dump.c similarity index 99% rename from src/cmd4.c rename to src/cmd-dump.c index c7dab9879..91d434438 100644 --- a/src/cmd4.c +++ b/src/cmd-dump.c @@ -41,6 +41,8 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" + #include "autopick.h" #include "birth.h" diff --git a/src/cmd-dump.h b/src/cmd-dump.h new file mode 100644 index 000000000..f72c2d256 --- /dev/null +++ b/src/cmd-dump.h @@ -0,0 +1,32 @@ +#pragma once + +/* cmd4.c */ +#ifndef JP +extern concptr get_ordinal_number_suffix(int num); +#endif +extern errr do_cmd_write_nikki(int type, int num, concptr note); +extern void do_cmd_nikki(void); +extern void do_cmd_redraw(void); +extern void do_cmd_change_name(void); +extern void do_cmd_message_one(void); +extern void do_cmd_messages(int num_now); +extern void do_cmd_options_aux(int page, concptr info); +extern void do_cmd_options(void); +extern void do_cmd_pref(void); +extern void do_cmd_reload_autopick(void); +extern void do_cmd_macros(void); +extern void do_cmd_visuals(void); +extern void do_cmd_colors(void); +extern void do_cmd_note(void); +extern void do_cmd_version(void); +extern void do_cmd_feeling(void); +extern void do_cmd_load_screen(void); +extern void do_cmd_save_screen_html_aux(char *filename, int message); +extern void do_cmd_save_screen(void); +extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]); +extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]); +extern void do_cmd_knowledge(void); +extern void plural_aux(char * Name); +extern void do_cmd_checkquest(void); +extern void do_cmd_time(void); +extern void do_cmd_suicide(void); \ No newline at end of file diff --git a/src/cmd-pet.c b/src/cmd-pet.c index f49025f95..1c5e1cd30 100644 --- a/src/cmd-pet.c +++ b/src/cmd-pet.c @@ -1,6 +1,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "floor.h" #include "grid.h" #include "melee.h" diff --git a/src/cmd-spell.c b/src/cmd-spell.c index e614373fc..912cc9ee3 100644 --- a/src/cmd-spell.c +++ b/src/cmd-spell.c @@ -9,6 +9,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "selfinfo.h" #include "spells.h" #include "spells-summon.h" diff --git a/src/core.c b/src/core.c index 88c94aade..d390bbe8a 100644 --- a/src/core.c +++ b/src/core.c @@ -16,6 +16,7 @@ #include "birth.h" #include "bldg.h" #include "cmd-activate.h" +#include "cmd-dump.h" #include "cmd-eat.h" #include "cmd-hissatsu.h" #include "cmd-item.h" diff --git a/src/externs.h b/src/externs.h index c186c34c1..50f860f51 100644 --- a/src/externs.h +++ b/src/externs.h @@ -276,36 +276,6 @@ extern FEAT_IDX feat_ground_type[100], feat_wall_type[100]; extern COMMAND_CODE now_message; extern bool use_menu; -/* cmd4.c */ -#ifndef JP -extern concptr get_ordinal_number_suffix(int num); -#endif -extern errr do_cmd_write_nikki(int type, int num, concptr note); -extern void do_cmd_nikki(void); -extern void do_cmd_redraw(void); -extern void do_cmd_change_name(void); -extern void do_cmd_message_one(void); -extern void do_cmd_messages(int num_now); -extern void do_cmd_options_aux(int page, concptr info); -extern void do_cmd_options(void); -extern void do_cmd_pref(void); -extern void do_cmd_reload_autopick(void); -extern void do_cmd_macros(void); -extern void do_cmd_visuals(void); -extern void do_cmd_colors(void); -extern void do_cmd_note(void); -extern void do_cmd_version(void); -extern void do_cmd_feeling(void); -extern void do_cmd_load_screen(void); -extern void do_cmd_save_screen_html_aux(char *filename, int message); -extern void do_cmd_save_screen(void); -extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]); -extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]); -extern void do_cmd_knowledge(void); -extern void plural_aux(char * Name); -extern void do_cmd_checkquest(void); -extern void do_cmd_time(void); -extern void do_cmd_suicide(void); /* dungeon.c */ extern void play_game(bool new_game); diff --git a/src/files.c b/src/files.c index ee4d25bc8..7c29484af 100644 --- a/src/files.c +++ b/src/files.c @@ -21,6 +21,7 @@ #include "bldg.h" +#include "cmd-dump.h" #include "world.h" #include "player-race.h" #include "player-status.h" diff --git a/src/floor-events.c b/src/floor-events.c index 09a27e9ea..e1c8df037 100644 --- a/src/floor-events.c +++ b/src/floor-events.c @@ -14,6 +14,7 @@ #include "player-effects.h" #include "objectkind.h" #include "object-ego.h" +#include "cmd-dump.h" static bool mon_invis; static POSITION mon_fy, mon_fx; diff --git a/src/floor-generate.c b/src/floor-generate.c index 3b2757986..acf2c2666 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -100,6 +100,7 @@ #include "util.h" #include "bldg.h" +#include "cmd-dump.h" #include "grid.h" #include "rooms.h" #include "dungeon.h" diff --git a/src/floor-save.c b/src/floor-save.c index e31d4ad51..7b8489289 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -32,6 +32,7 @@ #include "player-effects.h" #include "world.h" #include "spells.h" +#include "cmd-dump.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/main-win.c b/src/main-win.c index 75a827813..86389ac53 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -100,6 +100,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "view-mainwindow.h" #include "floor.h" #include "floor-events.h" diff --git a/src/monster-process.c b/src/monster-process.c index 9056d1d81..9acd600cc 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -16,6 +16,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "cmd-pet.h" #include "melee.h" #include "spells.h" diff --git a/src/monster-status.c b/src/monster-status.c index b0075e0b7..200a2dde1 100644 --- a/src/monster-status.c +++ b/src/monster-status.c @@ -1,6 +1,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "dungeon.h" #include "floor.h" #include "grid.h" diff --git a/src/monster1.c b/src/monster1.c index b24c2bf07..48d859370 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -13,6 +13,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "bldg.h" #include "cmd-pet.h" #include "floor.h" diff --git a/src/monster2.c b/src/monster2.c index c7935c01d..40213be83 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -13,6 +13,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "cmd-pet.h" #include "dungeon.h" #include "floor.h" diff --git a/src/mutation.c b/src/mutation.c index 0d70e3c52..d57f9eaf0 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -14,6 +14,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "mutation.h" #include "selfinfo.h" diff --git a/src/object2.c b/src/object2.c index 7c859aedd..2637dc189 100644 --- a/src/object2.c +++ b/src/object2.c @@ -16,6 +16,7 @@ #include "object.h" +#include "cmd-dump.h" #include "spells.h" #include "dungeon.h" #include "floor.h" diff --git a/src/patron.c b/src/patron.c index 4873e2455..f5e40f3d0 100644 --- a/src/patron.c +++ b/src/patron.c @@ -2,6 +2,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "patron.h" #include "cmd-pet.h" #include "object-curse.h" diff --git a/src/player-effects.c b/src/player-effects.c index 3529728ee..2f6385b9f 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -16,6 +16,7 @@ #include "util.h" #include "artifact.h" +#include "cmd-dump.h" #include "floor.h" #include "bldg.h" #include "birth.h" diff --git a/src/player-status.c b/src/player-status.c index a4e73bc88..a7140107a 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -29,6 +29,7 @@ #include "objectkind.h" #include "monsterrace.h" #include "autopick.h" +#include "cmd-dump.h" /*! * @var horror_desc diff --git a/src/quest.c b/src/quest.c index 35be28952..5c8f65d85 100644 --- a/src/quest.c +++ b/src/quest.c @@ -12,6 +12,7 @@ #include "artifact.h" #include "feature.h" #include "world.h" +#include "cmd-dump.h" /* * Quest info diff --git a/src/scores.c b/src/scores.c index 08627d971..4d11717e1 100644 --- a/src/scores.c +++ b/src/scores.c @@ -22,6 +22,7 @@ #include "scores.h" #include "floor.h" #include "world.h" +#include "cmd-dump.h" /*! * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file diff --git a/src/spells1.c b/src/spells1.c index d87df7a19..ba455db5f 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -15,6 +15,7 @@ #include "util.h" #include "cmd-pet.h" +#include "cmd-dump.h" #include "floor.h" #include "trap.h" #include "autopick.h" diff --git a/src/spells2.c b/src/spells2.c index 395f86edc..c00a8db2c 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -16,6 +16,7 @@ #include "artifact.h" #include "cmd-pet.h" +#include "cmd-dump.h" #include "floor.h" #include "grid.h" #include "trap.h" diff --git a/src/spells3.c b/src/spells3.c index edcc74d57..d9091322f 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -36,6 +36,7 @@ #include "monster-status.h" #include "monster-spell.h" #include "cmd-spell.h" +#include "cmd-dump.h" #include "snipe.h" #include "floor-save.h" #include "files.h" diff --git a/src/store.c b/src/store.c index cb877182e..887b0fb8b 100644 --- a/src/store.c +++ b/src/store.c @@ -14,6 +14,7 @@ #include "util.h" #include "floor.h" +#include "cmd-dump.h" #include "cmd-item.h" #include "cmd-smith.h" #include "cmd-zapwand.h" diff --git a/src/trap.c b/src/trap.c index ddde0653e..e75729f89 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1,6 +1,7 @@ #include "angband.h" #include "util.h" +#include "cmd-dump.h" #include "trap.h" #include "player-damage.h" #include "player-move.h" diff --git a/src/util.c b/src/util.c index 8167232fb..da3acc72b 100644 --- a/src/util.c +++ b/src/util.c @@ -17,6 +17,7 @@ #include "quest.h" #include "floor.h" #include "world.h" +#include "cmd-dump.h" static int num_more = 0; diff --git a/src/wizard2.c b/src/wizard2.c index f47bdeb55..293cb782d 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -12,6 +12,7 @@ #include "angband.h" #include "dungeon.h" +#include "cmd-dump.h" #include "util.h" #include "birth.h" #include "selfinfo.h" -- 2.11.0