[Refactor] #37353 TRAVEL 定義を player-move.h へ移動．

diff --git a/src/cmd-basic.h b/src/cmd-basic.h
index 71ea688..bd06d6f 100644 (file)
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -1,4 +1,5 @@
 #pragma once
+
 /* cmd2.c */
 extern bool cmd_limit_cast(player_type *creature_ptr);
 extern bool cmd_limit_arena(player_type *creature_ptr);
@@ -25,9 +26,6 @@ extern void do_cmd_rest(void);
 extern void do_cmd_fire(SPELL_IDX snipe_type);
 extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr, SPELL_IDX snipe_type);
 extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken);
-#ifdef TRAVEL
-extern void do_cmd_travel(void);
-#endif
 extern bool easy_open_door(POSITION y, POSITION x);
 extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir);
 

diff --git a/src/defines.h b/src/defines.h
index 5623249..fc2d851 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -128,11 +128,6 @@
 #define MON_INVULNER(M_PTR) ((M_PTR)->mtimed[MTIMED_INVULNER])
 
 /*
- * For travel command (auto run)
- */
-#define TRAVEL
-
-/*
   Language selection macro
 */
 #ifdef JP

diff --git a/src/player-move.h b/src/player-move.h
index 7bb555f..a1752e7 100644 (file)
--- a/src/player-move.h
+++ b/src/player-move.h
@@ -1,6 +1,11 @@
 #pragma once
 #include "floor.h"
 
+/*
+ * For travel command (auto run)
+ */
+#define TRAVEL
+
 extern void disturb(bool stop_search, bool flush_output);
 extern void move_player(DIRECTION dir, bool do_pickup, bool break_trap);
 extern void run_step(DIRECTION dir);
@@ -11,6 +16,7 @@ extern bool trap_can_be_ignored(FEAT_IDX feat);
 extern void search(void);
 extern void carry(bool pickup);
 #ifdef TRAVEL
+extern void do_cmd_travel(void);
 extern void travel_step(void);
 #endif