From 050cea819289cec41a7429707213a49fc616dbc8 Mon Sep 17 00:00:00 2001 From: deskull Date: Tue, 2 Apr 2019 10:12:25 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20cmd-mane.h=20=E3=82=92?= =?utf8?q?=E4=BD=9C=E6=88=90=E3=81=97=E3=81=A6=E5=A4=89=E6=95=B0=E5=AE=A3?= =?utf8?q?=E8=A8=80=E7=A7=BB=E5=8B=95=E3=80=82=20mane.c=20=E3=82=92=20cmd-?= =?utf8?q?mane.c=20=E3=81=AB=E6=94=B9=E5=90=8D=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 | 7 ++++++- src/Makefile.am | 5 +++-- src/{mane.c => cmd-mane.c} | 0 src/cmd-mane.h | 4 ++++ src/dungeon.c | 1 + src/externs.h | 2 -- src/racial.c | 1 + 8 files changed, 17 insertions(+), 6 deletions(-) rename src/{mane.c => cmd-mane.c} (100%) create mode 100644 src/cmd-mane.h diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index fc7fdbfea..7fd1a1fcb 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -144,6 +144,7 @@ + @@ -184,6 +185,7 @@ + @@ -209,7 +211,6 @@ - diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index badf65ecb..a5949a62f 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -27,7 +27,6 @@ - @@ -252,6 +251,9 @@ object + + cmd + @@ -457,6 +459,9 @@ cmd + + cmd + diff --git a/src/Makefile.am b/src/Makefile.am index e102ef583..2443279cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,8 @@ hengband_SOURCES = \ \ birth.c bldg.c chest.c chest.h chuukei.c \ cmd2.c cmd4.c 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-pet.c cmd-pet.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 \ cmd-usestaff.c cmd-usestaff.h cmd-zaprod.c cmd-zaprod.h cmd-zapwand.c \ cmd-zapwand.h cmd-smith.c cmd-smith.h cmd-hissatsu.c cmd-hissatsu.h\ @@ -31,7 +32,7 @@ hengband_SOURCES = \ generate.h grid.c grid.h h-basic.h h-config.h h-define.h \ history.h history.c \ h-system.h h-type.h inet.c init1.c init2.c init.h japanese.c load.c \ - main.c main-x11.c main-gcu.c mane.c \ + main.c main-x11.c main-gcu.c \ melee.h melee1.c mind.c \ \ monster.h \ diff --git a/src/mane.c b/src/cmd-mane.c similarity index 100% rename from src/mane.c rename to src/cmd-mane.c diff --git a/src/cmd-mane.h b/src/cmd-mane.h new file mode 100644 index 000000000..80a71fb2d --- /dev/null +++ b/src/cmd-mane.h @@ -0,0 +1,4 @@ +#pragma once + +/* mane.c */ +extern bool do_cmd_mane(bool baigaesi); diff --git a/src/dungeon.c b/src/dungeon.c index 430e853e6..a585858bd 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -16,6 +16,7 @@ #include "cmd-hissatsu.h" #include "cmd-item.h" #include "cmd-magiceat.h" +#include "cmd-mane.h" #include "cmd-quaff.h" #include "cmd-read.h" #include "cmd-smith.h" diff --git a/src/externs.h b/src/externs.h index 734d809b4..e8bba774d 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1157,8 +1157,6 @@ extern void mindcraft_info(char *p, int use_mind, int power); extern void do_cmd_mind(void); extern void do_cmd_mind_browse(void); -/* mane.c */ -extern bool do_cmd_mane(bool baigaesi); /* mspells1.c */ extern bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend); diff --git a/src/racial.c b/src/racial.c index 0bf03f36e..c1a972e41 100644 --- a/src/racial.c +++ b/src/racial.c @@ -12,6 +12,7 @@ #include "angband.h" #include "cmd-magiceat.h" +#include "cmd-mane.h" #include "cmd-zapwand.h" #include "cmd-pet.h" #include "melee.h" -- 2.11.0