Simplify the critical-shot-calcuration

[hengband/hengband.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index 492fbb7..96f581c 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -57,7 +57,7 @@
 #define FAKE_VERSION   0
 #define FAKE_VER_MAJOR 12
 #define FAKE_VER_MINOR 1
-#define FAKE_VER_PATCH 1
+#define FAKE_VER_PATCH 2
 
 
 /*
@@ -75,8 +75,8 @@
  */
 #define H_VER_MAJOR 2
 #define H_VER_MINOR 1
-#define H_VER_PATCH 1
-#define H_VER_EXTRA 0
+#define H_VER_PATCH 2
+#define H_VER_EXTRA 1
 
 
 #define ANGBAND_2_8_1
@@ -2633,7 +2633,7 @@
 #define CAVE_MASK (CAVE_FLOOR | CAVE_EXTRA | CAVE_INNER | CAVE_OUTER | CAVE_SOLID | CAVE_VAULT)
 
 /* Used only after cave generation */
-#define CAVE_XXXX1      0x0200
+#define CAVE_KNOWN      0x0200    /* Directly viewed or map detected flag */
 #define CAVE_NOTE       0x0400    /* Flag for delayed visual update (needs note_spot()) */
 #define CAVE_REDRAW     0x0800    /* Flag for delayed visual update (needs lite_spot()) */
 #define CAVE_OBJECT     0x1000    /* Mirror, glyph, etc. */
@@ -3360,7 +3360,7 @@
 #define TR_WARNING             72     /* Warning */
 #define TR_HIDE_TYPE           73     /* Hide "pval" description */
 #define TR_SHOW_MODS           74     /* Always show Tohit/Todam */
-#define TR_XXX1                75     /* XXX1 */
+#define TR_SLAY_GOOD           75
 #define TR_LEVITATION             76     /* Feather Falling */
 #define TR_LITE                77     /* Permanent Light */
 #define TR_SEE_INVIS           78     /* See Invisible */
@@ -3380,7 +3380,7 @@
 #define TR_BLESSED             92     /* Item is Blessed */
 #define TR_ES_ATTACK           93     /* Fake flag for Smith */
 #define TR_ES_AC               94     /* Fake flag for Smith */
-#define TR_XXX5                95
+#define TR_KILL_GOOD           95
 
 #define TR_KILL_ANIMAL         96
 #define TR_KILL_EVIL           97
@@ -4654,8 +4654,9 @@ extern int PlayerUID;
 #define BACT_POKER                  43
 #define BACT_IDENT_ONE              44
 #define BACT_RECHARGE_ALL           45
-#define BACT_EVAL_AC               46
-#define MAX_BACT                    47
+#define BACT_EVAL_AC                   46
+#define BACT_BROKEN_WEAPON          47
+#define MAX_BACT                    48
 
 /*
  * Quest status