[Refactor] #37353 externs.h の宣言いくつかを shoot.h へ移動。 / Move some externs.h declarations...

diff --git a/src/Makefile.am b/src/Makefile.am
index adcda3b..61e64ac 100644 (file)
--- 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 209c29c..88693c3 100644 (file)
--- 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 e75b317..f13c8d3 100644 (file)
--- 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 40a93fc..f0c3fec 100644 (file)
--- 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 7fa8fe6..f4c6bfc 100644 (file)
--- 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 (file)
index 0000000..205a89f
--- /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);