[Refactor] #37353 command_* を util.c/h に移動．

[hengband/hengband.git] / src / variable.c

diff --git a/src/variable.c b/src/variable.c
index b6d7546..8937073 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -13,46 +13,10 @@
 #include "angband.h"
 #include "geometry.h"
 
-s16b command_cmd;              /* Current "Angband Command" */
-
-COMMAND_ARG command_arg;       /*!< 各種コマンドの汎用的な引数として扱う / Gives argument of current command */
-COMMAND_NUM command_rep;       /*!< 各種コマンドの汎用的なリピート数として扱う / Gives repetition of current command */
-DIRECTION command_dir;         /*!< 各種コマンドの汎用的な方向値処理として扱う/ Gives direction of current command */
-
-s16b command_see;              /* See "object1.c" */
-s16b command_wrk;              /* See "object1.c" */
-
-TERM_LEN command_gap = 999;         /* See "object1.c" */
-
-s16b command_new;              /* Command chaining from inven/equip view */
-
-bool msg_flag;                 /* Used in msg_print() for "buffering" */
-
-s16b running;                  /* Current counter for running, if any */
-
-GAME_TURN old_battle;
-
-s16b signal_count;             /* Hack -- Count interupts */
-
-bool inkey_base;               /* See the "inkey()" function */
-bool inkey_xtra;               /* See the "inkey()" function */
-bool inkey_scan;               /* See the "inkey()" function */
-bool inkey_flag;               /* See the "inkey()" function */
-bool get_com_no_macros = FALSE;        /* Expand macros in "get_com" or not */
-
-OBJECT_SUBTYPE_VALUE coin_type;        /* Hack -- force coin type */
 
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */
 
-MONSTER_IDX hack_m_idx = 0;    /* Hack -- see "process_monsters()" */
-MONSTER_IDX hack_m_idx_ii = 0;
-
-bool multi_rew = FALSE;
-
-int total_friends = 0;
-int leaving_quest = 0;
-bool reinit_wilderness = FALSE;
 
 /*
  * Dungeon size info
@@ -64,63 +28,14 @@ POSITION panel_col_prt, panel_row_prt;
 
 
 /*
- * Targetting variables
- */
-MONSTER_IDX target_who;
-POSITION target_col;
-POSITION target_row;
-
-
-/*
  * User info
  */
 int player_uid;
 int player_euid;
 int player_egid;
 
-/*
- * Stripped version of "player_name"
- */
-char player_base[32];
-
-
-/*
- * Buffer to hold the current savefile name
- * 'savefile' holds full path name. 'savefile_base' holds only base name.
- */
-char savefile[1024];
-char savefile_base[40];
-
-
 pos_list tmp_pos;
 
-
-/*
- * Number of active macros.
- */
-s16b macro__num;
-
-/*
- * Array of macro patterns [MACRO_MAX]
- */
-concptr *macro__pat;
-
-/*
- * Array of macro actions [MACRO_MAX]
- */
-concptr *macro__act;
-
-/*
- * Array of macro types [MACRO_MAX]
- */
-bool *macro__cmd;
-
-/*
- * Current macro action [1024]
- */
-char *macro__buf;
-
-
 /*
  * The number of quarks
  */
@@ -137,18 +52,6 @@ concptr *quark__str;
 term *angband_term[8];
 
 /*
- * Number of floor_id used from birth
- */
-FLOOR_IDX max_floor_id;
-
-/*
- * Sign for current process used in temporal files.
- * Actually it is the start time of current process.
- */
-u32b saved_floor_file_sign;
-
-
-/*
  * Keymaps for each "mode" associated with each keypress.
  */
 concptr keymap_act[KEYMAP_MODES][256];
@@ -168,48 +71,6 @@ player_type p_body;
 player_type *p_ptr = &p_body;
 
 
-/*
- * Here is a "pseudo-hook" used during calls to "get_item()" and
- * "show_inven()" and "show_equip()", and the choice window routines.
- */
-OBJECT_TYPE_VALUE item_tester_tval;
-
-
-/*
- * Here is a "hook" used during calls to "get_item()" and
- * "show_inven()" and "show_equip()", and the choice window routines.
- */
-bool (*item_tester_hook)(object_type*);
-
-
-
-
-/*
- * Hack -- function hooks to restrict "get_mon_num_prep()" function
- */
-monsterrace_hook_type get_mon_num_hook;
-monsterrace_hook_type get_mon_num2_hook;
-
-
-/*
- * Hack -- function hook to restrict "get_obj_num_prep()" function
- */
-bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
-
-/*
- * Flags for initialization
- */
-int init_flags;
-
-
-/*
- * The "highscore" file descriptor, if available.
- */
-int highscore_fd = -1;
-
-bool can_save = FALSE;        /* Game can be saved */
-
-
 MONSTER_IDX pet_t_m_idx;
 MONSTER_IDX riding_t_m_idx;
 
@@ -225,7 +86,6 @@ bool new_mane;
  */
 DEPTH *max_dlv;
 
-COMMAND_CODE now_message;
 bool use_menu;
 
 #ifdef CHUUKEI