From 3bb64ec055e0487a24c68e5baa16b609e118d9db Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Thu, 30 May 2019 00:07:10 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B9=E3=83=8A?=
 =?utf8?q?=E3=82=A4=E3=83=91=E3=83=BC=E8=83=BD=E5=8A=9B=E5=AE=9A=E7=BE=A9?=
 =?utf8?q?=20SP=5F*=20=E3=82=92=20snipe.h=20=E3=81=B8=E7=A7=BB=E5=8B=95?=
 =?utf8?q?=EF=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-basic.c |  1 +
 src/cmd-item.c  |  1 +
 src/defines.h   | 18 ------------------
 src/object1.c   |  1 +
 src/snipe.h     | 18 ++++++++++++++++++
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 48abec371..4316073b9 100644
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -44,6 +44,7 @@
 #include "object-broken.h"
 #include "object-flavor.h"
 #include "shoot.h"
+#include "snipe.h"
 
 #include "cmd-basic.h"
 #include "cmd-item.h"
diff --git a/src/cmd-item.c b/src/cmd-item.c
index 82bf1392e..893aa7a55 100644
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -43,6 +43,7 @@
 #include "objectkind.h"
 #include "autopick.h"
 #include "targeting.h"
+#include "snipe.h"
 
 /*!
  * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display p_ptr->inventory_list
diff --git a/src/defines.h b/src/defines.h
index 0924f7ae1..189f990e1 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1551,24 +1551,6 @@ extern int PlayerUID;
  */
 #define TRAVEL
 
-/* Sniper */
-#define SP_NONE          0
-#define SP_LITE          1
-#define SP_AWAY          2
-#define SP_FIRE          3
-#define SP_KILL_WALL     4
-#define SP_COLD          5
-#define SP_KILL_TRAP     6
-#define SP_ELEC          7
-#define SP_PIERCE        8
-#define SP_RUSH          9
-#define SP_DOUBLE        10
-#define SP_EXPLODE       11
-#define SP_EVILNESS      12
-#define SP_HOLYNESS      13
-#define SP_FINAL         14
-#define SP_NEEDLE        15
-
 #define CONCENT_RADAR_THRESHOLD 2
 #define CONCENT_TELE_THRESHOLD  5
 
diff --git a/src/object1.c b/src/object1.c
index cf2d138e2..474f996db 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -27,6 +27,7 @@
 #include "files.h"
 #include "term.h"
 #include "cmd-smith.h"
+#include "snipe.h"
 #include "view-mainwindow.h"
 
 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
diff --git a/src/snipe.h b/src/snipe.h
index ecd87ce27..0f99d822b 100644
--- a/src/snipe.h
+++ b/src/snipe.h
@@ -1,5 +1,23 @@
 #pragma once
 
+/* Sniper */
+#define SP_NONE          0
+#define SP_LITE          1
+#define SP_AWAY          2
+#define SP_FIRE          3
+#define SP_KILL_WALL     4
+#define SP_COLD          5
+#define SP_KILL_TRAP     6
+#define SP_ELEC          7
+#define SP_PIERCE        8
+#define SP_RUSH          9
+#define SP_DOUBLE        10
+#define SP_EXPLODE       11
+#define SP_EVILNESS      12
+#define SP_HOLYNESS      13
+#define SP_FINAL         14
+#define SP_NEEDLE        15
+
 /* snipe.c */
 extern void reset_concentration(bool msg);
 extern void display_snipe_list(void);
-- 
2.11.0