Thrown torch's dice is changed

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

diff --git a/src/variable.c b/src/variable.c
index 1eecab5..b9b3f37 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -16,7 +16,7 @@
 /*
  * Hack -- Link a copyright message into the executable
  */
-cptr copyright[5] =
+const cptr copyright[5] =
 {
        "Copyright (c) 1989 James E. Wilson, Robert A. Keoneke",
        "",
@@ -88,6 +88,8 @@ bool character_saved;         /* The character was just saved to a savefile */
 bool character_icky;           /* The game is in an icky full screen mode */
 bool character_xtra;           /* The game is in an icky startup mode */
 
+bool creating_savefile;                /* New savefile is currently created */
+
 u32b seed_flavor;              /* Hack -- consistent object colors */
 u32b seed_town;                        /* Hack -- consistent town layout */
 
@@ -120,7 +122,9 @@ s16b monster_level;         /* Current monster creation level */
 s16b base_level;        /* Base dungeon level */
 
 s32b turn;                             /* Current game turn */
+s32b turn_limit;               /* Limit of game turn */
 s32b dungeon_turn;                     /* Game turn in dungeon */
+s32b dungeon_turn_limit;       /* Limit of game turn in dungeon */
 s32b old_turn;                 /* Turn when level began */
 s32b old_battle;
 
@@ -134,6 +138,7 @@ 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 */
 
 s16b coin_type;                        /* Hack -- force coin type */
 
@@ -164,7 +169,6 @@ bool multi_rew = FALSE;
 char summon_kin_type;   /* Hack, by Julian Lighton: summon 'relatives' */
 
 int total_friends = 0;
-s32b total_friend_levels = 0;
 s32b friend_align = 0;
 
 int leaving_quest = 0;
@@ -539,7 +543,7 @@ term *angband_term[8];
 /*
  * Standard window names
  */
-char angband_term_name[8][16] =
+const char angband_term_name[8][16] =
 {
        "Hengband",
        "Term-1",
@@ -579,9 +583,9 @@ byte angband_color_table[256][4] =
 /*
  * Standard sound names
  */
-char angband_sound_name[SOUND_MAX][16] =
+const cptr angband_sound_name[SOUND_MAX] =
 {
-       "",
+       "dummy",
        "hit",
        "miss",
        "flee",
@@ -772,11 +776,11 @@ player_type *p_ptr = &p_body;
  * Pointer to the player tables
  * (sex, race, class, magic)
  */
-player_sex *sp_ptr;
-player_race *rp_ptr;
-player_class *cp_ptr;
-player_seikaku *ap_ptr;
-player_magic *mp_ptr;
+const player_sex *sp_ptr;
+const player_race *rp_ptr;
+const player_class *cp_ptr;
+const player_seikaku *ap_ptr;
+const player_magic *mp_ptr;
 
 
 /*
@@ -1202,21 +1206,7 @@ s16b feat_explosive_rune;
 s16b feat_mirror;
 
 /* Doors */
-s16b feat_open_door;
-s16b feat_broken_door;
-s16b feat_closed_door;
-
-/* Locked doors */
-s16b feat_locked_door[MAX_LJ_DOORS];
-s16b num_locked_door = 0;
-
-/* Jammed doors */
-s16b feat_jammed_door[MAX_LJ_DOORS];
-s16b num_jammed_door = 0;
-
-/* Curtains */
-s16b feat_open_curtain;
-s16b feat_closed_curtain;
+door_type feat_door[MAX_DOOR_TYPES];
 
 /* Stairs */
 s16b feat_up_stair;
@@ -1239,6 +1229,13 @@ s16b feat_quartz_vein;
 s16b feat_granite;
 s16b feat_permanent;
 
+/* Glass floor */
+s16b feat_glass_floor;
+
+/* Glass walls */
+s16b feat_glass_wall;
+s16b feat_permanent_glass_wall;
+
 /* Pattern */
 s16b feat_pattern_start;
 s16b feat_pattern_1;
@@ -1291,3 +1288,16 @@ bool chuukei_client;
 char *server_name;
 int server_port;
 #endif
+
+/* for movie */
+bool browsing_movie;
+
+#ifdef TRAVEL
+/* for travel */
+travel_type travel;
+#endif
+
+/* for snipers */
+int snipe_type = SP_NONE;
+bool reset_concent = FALSE;   /* Concentration reset flag */
+bool is_fired = FALSE;