From 2114c3470f1650d2a7c115fb99202bfe98b83710 Mon Sep 17 00:00:00 2001 From: Deskull Date: Tue, 29 Jan 2019 13:19:18 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20externs.h=20=E3=81=AE?= =?utf8?q?=E5=AE=A3=E8=A8=80=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B=E3=82=92?= =?utf8?q?=20shoot.h=20=E3=81=B8=E7=A7=BB=E5=8B=95=E3=80=82=20/=20Move=20s?= =?utf8?q?ome=20externs.h=20declarations=20to=20shoot.h.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/Makefile.am | 2 +- src/externs.h | 3 --- src/files.c | 1 + src/flavor.c | 1 + src/shoot.c | 1 + src/shoot.h | 9 +++++++++ 6 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 src/shoot.h diff --git a/src/Makefile.am b/src/Makefile.am index adcda3bf4..61e64ac8b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,7 +57,7 @@ hengband_SOURCES = \ report.c rooms.c rooms-city.c rooms-city.h rooms-fractal.c rooms-fractal.h \ rooms.h rooms-normal.c rooms-normal.h rooms-pitnest.c rooms-pitnest.h \ rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h rooms-vault.c \ - rooms-vault.h save.c scores.c selfinfo.c selfinfo.h shoot.c snipe.c \ + rooms-vault.h save.c scores.c selfinfo.c selfinfo.h shoot.c shoot.h snipe.c \ \ rumor.h rumor.c \ \ diff --git a/src/externs.h b/src/externs.h index 209c29c36..88693c3e4 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1495,6 +1495,3 @@ extern void kamaenaoshi(INVENTORY_IDX item); extern bool ang_sort_comp_hook(vptr u, vptr v, int a, int b); extern void ang_sort_swap_hook(vptr u, vptr v, int a, int b); -/* shoot.c */ -extern ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval); -extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval); diff --git a/src/files.c b/src/files.c index e75b3173e..f13c8d341 100644 --- a/src/files.c +++ b/src/files.c @@ -22,6 +22,7 @@ #include "store.h" #include "artifact.h" #include "avatar.h" +#include "shoot.h" /* diff --git a/src/flavor.c b/src/flavor.c index 40a93fce3..f0c3fecc4 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -12,6 +12,7 @@ #include "angband.h" #include "player-status.h" +#include "shoot.h" /*! * @brief 最初から簡易な名称が明らかになるベースアイテムの判定。 / Certain items, if aware, are known instantly diff --git a/src/shoot.c b/src/shoot.c index 7fa8fe641..f4c6bfc7a 100644 --- a/src/shoot.c +++ b/src/shoot.c @@ -4,6 +4,7 @@ #include "artifact.h" #include "avatar.h" +#include "shoot.h" /*! * @brief 矢弾を射撃した際のスレイ倍率をかけた結果を返す / * Determines the odds of an object breaking when thrown at a monster diff --git a/src/shoot.h b/src/shoot.h new file mode 100644 index 000000000..205a89fb5 --- /dev/null +++ b/src/shoot.h @@ -0,0 +1,9 @@ +/*! + * @file shoot.c + */ + + +#pragma once + +extern ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval); +extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval); -- 2.11.0