[Refactor] #40535 Moved the decleration of function forget_travel_flow() from cmd...

diff --git a/src/cmd/cmd-basic.h b/src/cmd/cmd-basic.h
index b811b9b..3d2f32f 100644 (file)
--- a/src/cmd/cmd-basic.h
+++ b/src/cmd/cmd-basic.h
@@ -2,7 +2,6 @@
 
 #include "system/angband.h"
 
-void forget_travel_flow(floor_type *floor_ptr);
 void do_cmd_search(player_type *creature_ptr);
 void do_cmd_alter(player_type *creature_ptr);
 void do_cmd_suicide(player_type *creature_ptr);

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 28d5708..dd15cf3 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -12,7 +12,6 @@
 #include "floor/floor-save.h"
 #include "cmd-building/cmd-building.h"
 #include "cmd-io/cmd-dump.h"
-#include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
@@ -53,6 +52,7 @@
 #include "object-hook/hook-enchant.h"
 #include "pet/pet-util.h"
 #include "player/player-class.h"
+#include "player/player-move.h"
 #include "player/player-personalities-types.h"
 #include "player/special-defense-types.h"
 #include "savedata/floor-loader.h"

diff --git a/src/player/player-move.h b/src/player/player-move.h
index 3f7f289..487f3d9 100644 (file)
--- a/src/player/player-move.h
+++ b/src/player/player-move.h
@@ -3,9 +3,6 @@
 #include "system/angband.h"
 #include "floor/floor.h"
 
-void disturb(player_type *creature_ptr, bool stop_search, bool flush_output);
-void run_step(player_type *creature_ptr, DIRECTION dir);
-
 #define MPE_STAYING       0x00000001
 #define MPE_FORGET_FLOW   0x00000002
 #define MPE_HANDLE_STUFF  0x00000004
@@ -14,14 +11,6 @@ void run_step(player_type *creature_ptr, DIRECTION dir);
 #define MPE_DO_PICKUP     0x00000020
 #define MPE_BREAK_TRAP    0x00000040
 #define MPE_DONT_SWAP_MON 0x00000080
-bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
-void py_pickup_aux(player_type *owner_ptr, OBJECT_IDX o_idx);
-bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
-bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat);
-void search(player_type *creature_ptr);
-void carry(player_type *creature_ptr, bool pickup);
-void do_cmd_travel(player_type *creature_ptr);
-void travel_step(player_type *creature_ptr);
 
 /* Types of pattern tiles */
 #define NOT_PATTERN_TILE      -1
@@ -47,3 +36,15 @@ typedef struct {
 } travel_type;
 
 extern travel_type travel;
+
+void disturb(player_type *creature_ptr, bool stop_search, bool flush_output);
+void run_step(player_type *creature_ptr, DIRECTION dir);
+bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
+void py_pickup_aux(player_type *owner_ptr, OBJECT_IDX o_idx);
+bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
+bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat);
+void search(player_type *creature_ptr);
+void carry(player_type *creature_ptr, bool pickup);
+void do_cmd_travel(player_type *creature_ptr);
+void travel_step(player_type *creature_ptr);
+void forget_travel_flow(floor_type *floor_ptr);

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index edc934f..a2747f6 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -6,7 +6,6 @@
 
 #include "spell-kind/spells-floor.h"
 #include "cmd-io/cmd-dump.h"
-#include "cmd/cmd-basic.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
@@ -40,6 +39,7 @@
 #include "object-hook/hook-enchant.h"
 #include "object/object-mark-types.h"
 #include "perception/object-perception.h"
+#include "player/player-move.h"
 #include "player/special-defense-types.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/process-effect.h"