#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);
+extern void disturb(player_type *creature_ptr, bool stop_search, bool flush_output);
+extern void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool break_trap);
+extern void run_step(player_type *creature_ptr, DIRECTION dir);
#define MPE_STAYING 0x00000001
#define MPE_FORGET_FLOW 0x00000002
#define MPE_DO_PICKUP 0x00000020
#define MPE_BREAK_TRAP 0x00000040
#define MPE_DONT_SWAP_MON 0x00000080
-extern bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
+extern bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
-extern void py_pickup_aux(OBJECT_IDX o_idx);
-extern bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
-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
+extern void py_pickup_aux(player_type *owner_ptr, OBJECT_IDX o_idx);
+extern bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
+extern bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat);
+extern void search(player_type *creature_ptr);
+extern void carry(player_type *creature_ptr, bool pickup);
+extern void do_cmd_travel(player_type *creature_ptr);
+extern void travel_step(player_type *creature_ptr);
/* Types of pattern tiles */
#define NOT_PATTERN_TILE -1
#define PATTERN_TILE_TELEPORT 7
#define PATTERN_TILE_WRECKED 8
-
-#ifdef TRAVEL
/*
* A structure type for travel command
*/
DIRECTION dir; /* Running direction */
} travel_type;
-/* for travel */
extern travel_type travel;
-#endif
-