In English description for "Vampire's Fang" change "to" to "on" to be more idiomatic.

[hengbandforosx/hengbandosx.git] / src / variable.c

diff --git a/src/variable.c b/src/variable.c
index dc54611..558d625 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "geometry.h"
 
 /*!
  * コピーライト情報 /
@@ -156,8 +157,6 @@ bool multi_rew = FALSE;
 char summon_kin_type;   /* Hack, by Julian Lighton: summon 'relatives' */
 
 int total_friends = 0;
-s32b friend_align = 0;
-
 int leaving_quest = 0;
 bool reinit_wilderness = FALSE;
 
@@ -207,10 +206,8 @@ char player_base[32];
 char savefile[1024];
 char savefile_base[40];
 
-POSITION_IDX temp_n; //!< Array of grids for use by various functions (see "current_floor_ptr->grid_array.c")
-POSITION temp_y[TEMP_MAX];
-POSITION temp_x[TEMP_MAX];
 
+pos_list tmp_pos;
 
 
 /*
@@ -438,32 +435,28 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
  * Not completely allocated, that would be inefficient
  * Not completely hardcoded, that would overflow memory
  */
-floor_type floor;
-floor_type *current_floor_ptr = &floor;
+floor_type floor_info;
+floor_type *current_floor_ptr = &floor_info;
 
 /*
  * The array of saved floors
  */
 saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 
-
 /*
  * Number of floor_id used from birth
  */
 FLOOR_IDX max_floor_id;
 
-
 world_type world;
 world_type *current_world_ptr = &world;
 
-
 /*
- * Sign for current process used in temporal files.
+ * Sign for current process used in temporary files.
  * Actually it is the start time of current process.
  */
 u32b saved_floor_file_sign;
 
-
 /*
  * Maximum number of towns
  */
@@ -658,18 +651,6 @@ bool (*item_tester_hook)(object_type*);
 
 
 
-/*
- * Current "comp" function for ang_sort()
- */
-bool (*ang_sort_comp)(vptr u, vptr v, int a, int b);
-
-
-/*
- * Current "swap" function for ang_sort()
- */
-void (*ang_sort_swap)(vptr u, vptr v, int a, int b);
-
-
 
 /*
  * Hack -- function hooks to restrict "get_mon_num_prep()" function
@@ -683,13 +664,6 @@ monsterrace_hook_type get_mon_num2_hook;
  */
 bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 
-
-/*
- * Wilderness
- */
-wilderness_type **wilderness;
-
-
 /*
  * Buildings
  */
@@ -798,7 +772,6 @@ bool new_mane;
 
 bool mon_fight;
 
-bool ambush_flag;
 bool generate_encounter;
 
 concptr screen_dump = NULL;
@@ -912,7 +885,6 @@ travel_type travel;
 #endif
 
 /* for snipers */
-int snipe_type = SP_NONE;
 bool reset_concent = FALSE;   /* Concentration reset flag */
 bool is_fired = FALSE;