From 6bc923bbc86e1353a031b4d0e681d95678c91962 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Sun, 14 Apr 2019 21:40:03 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=E3=80=80MPE=5F*=20=E3=82=92?=
 =?utf8?q?=20player-move.h=20=E3=81=B8=E7=A7=BB=E5=8B=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-pet.c        |  1 +
 src/defines.h        | 13 -------------
 src/mind.c           |  1 +
 src/player-move.h    | 12 ++++++++++++
 src/realm-hissatsu.c |  1 +
 src/spells2.c        |  1 +
 src/spells3.c        |  1 +
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index c191645ab..3dbe12982 100644
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -2,6 +2,7 @@
 #include "floor.h"
 #include "melee.h"
 #include "sort.h"
+#include "player-move.h"
 #include "player-status.h"
 #include "object-hook.h"
 #include "monster.h"
diff --git a/src/defines.h b/src/defines.h
index 3a3244d99..6a1872cde 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -4286,19 +4286,6 @@ extern int PlayerUID;
 #define SKEY_TOP    	  0xf007
 #define SKEY_BOTTOM 	  0xf008
 
-/*
- * Bit flags for move_player_effect()
- */
-#define MPE_STAYING       0x00000001
-#define MPE_FORGET_FLOW   0x00000002
-#define MPE_HANDLE_STUFF  0x00000004
-#define MPE_ENERGY_USE    0x00000008
-#define MPE_DONT_PICKUP   0x00000010
-#define MPE_DO_PICKUP     0x00000020
-#define MPE_BREAK_TRAP    0x00000040
-#define MPE_DONT_SWAP_MON 0x00000080
-
-
 #define MTIMED_CSLEEP   0 /* Monster is sleeping */
 #define MTIMED_FAST     1 /* Monster is temporarily fast */
 #define MTIMED_SLOW     2 /* Monster is temporarily slow */
diff --git a/src/mind.c b/src/mind.c
index 871846496..c02312a58 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -19,6 +19,7 @@
 #include "melee.h"
 #include "spells-summon.h"
 #include "avatar.h"
+#include "player-move.h"
 #include "player-status.h"
 #include "spells-status.h"
 #include "cmd-spell.h"
diff --git a/src/player-move.h b/src/player-move.h
index 6d93ed6dc..ad2980ca0 100644
--- a/src/player-move.h
+++ b/src/player-move.h
@@ -12,3 +12,15 @@ extern void disturb(bool stop_search, bool flush_output);
 #define PATTERN_TILE_OLD      6
 #define PATTERN_TILE_TELEPORT 7
 #define PATTERN_TILE_WRECKED  8
+
+/*
+ * Bit flags for move_player_effect()
+ */
+#define MPE_STAYING       0x00000001
+#define MPE_FORGET_FLOW   0x00000002
+#define MPE_HANDLE_STUFF  0x00000004
+#define MPE_ENERGY_USE    0x00000008
+#define MPE_DONT_PICKUP   0x00000010
+#define MPE_DO_PICKUP     0x00000020
+#define MPE_BREAK_TRAP    0x00000040
+#define MPE_DONT_SWAP_MON 0x00000080
diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 195389fdd..45c0522f9 100644
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -5,6 +5,7 @@
 #include "monsterrace-hook.h"
 #include "artifact.h"
 #include "monster.h"
+#include "player-move.h"
 #include "player-status.h"
 #include "feature.h"
 
diff --git a/src/spells2.c b/src/spells2.c
index dd7b891cf..5c9768f5c 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -29,6 +29,7 @@
 #include "realm-hex.h"
 #include "object-hook.h"
 #include "monster-status.h"
+#include "player-move.h"
 #include "player-status.h"
 
 /*!
diff --git a/src/spells3.c b/src/spells3.c
index b68e6577d..8a2cd35b3 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -16,6 +16,7 @@
 #include "object-boost.h"
 #include "object-hook.h"
 #include "melee.h"
+#include "player-move.h"
 #include "player-status.h"
 #include "spells-summon.h"
 #include "quest.h"
-- 
2.11.0