adjust condition_aliases to include new macro masks

diff --git a/src/botl.c b/src/botl.c
index 24c438a9de4a28d1d0b3344ba73b124a31eeeb10..191b2ef31eaf1d656e93ad90810f8ee82e0c9ae7 100644 (file)
--- a/src/botl.c
+++ b/src/botl.c
@@ -510,6 +510,31 @@ static struct istat_s initblstats[MAXBLSTATS] = {
 #undef INIT_BLSTAT
 #undef INIT_THRESH
 
+#ifdef STATUS_HILITES
+
+const struct condmap condition_aliases[] = {
+    { "strangled",      BL_MASK_STRNGL },
+    { "all",            BL_MASK_BAREH | BL_MASK_BLIND | BL_MASK_BUSY
+                        | BL_MASK_CONF | BL_MASK_DEAF | BL_MASK_ELF_IRON
+                        | BL_MASK_FLY | BL_MASK_FOODPOIS | BL_MASK_GLOWHANDS
+                        | BL_MASK_GRAB | BL_MASK_HALLU | BL_MASK_HELD
+                        | BL_MASK_ICY | BL_MASK_INLAVA | BL_MASK_LEV
+                        | BL_MASK_PARLYZ | BL_MASK_RIDE | BL_MASK_SLEEPING
+                        | BL_MASK_SLIME | BL_MASK_SLIPPERY | BL_MASK_STONE
+                        | BL_MASK_STRNGL | BL_MASK_STUN | BL_MASK_SUBMERGED
+                        | BL_MASK_TERMILL | BL_MASK_TETHERED | BL_MASK_TRAPPED
+                        | BL_MASK_UNCONSC | BL_MASK_WOUNDEDL },
+    { "major_troubles", BL_MASK_FOODPOIS | BL_MASK_GRAB | BL_MASK_INLAVA
+                        | BL_MASK_SLIME | BL_MASK_STONE | BL_MASK_STRNGL
+                        | BL_MASK_TERMILL },
+    { "minor_troubles", BL_MASK_BLIND | BL_MASK_DEAF | BL_MASK_STUN
+                        | BL_MASK_CONF | BL_MASK_HALLU | BL_MASK_PARLYZ },
+    { "movement",       BL_MASK_LEV | BL_MASK_FLY | BL_MASK_RIDE },
+    { "self_inflicted", BL_MASK_ELF_IRON },
+};
+
+#endif /* STATUS_HILITES */
+
 const struct conditions_t conditions[] = {
     /* priority, mask, identifier, txt1, txt2, txt3 */
     { 3, BL_MASK_BAREH,     bl_bareh,     { "Bare",     "Bar",   "Bh"  } },
@@ -2481,22 +2506,6 @@ boolean from_configfile;
 
 #ifdef STATUS_HILITES
 
-const struct condmap condition_aliases[] = {
-    { "strangled",      BL_MASK_STRNGL },
-    { "all",            BL_MASK_STONE | BL_MASK_SLIME | BL_MASK_STRNGL
-                        | BL_MASK_FOODPOIS | BL_MASK_TERMILL
-                        | BL_MASK_BLIND | BL_MASK_DEAF | BL_MASK_STUN
-                        | BL_MASK_CONF | BL_MASK_HALLU
-                        | BL_MASK_LEV | BL_MASK_FLY | BL_MASK_RIDE
-                        | BL_MASK_ELF_IRON },
-    { "major_troubles", BL_MASK_STONE | BL_MASK_SLIME | BL_MASK_STRNGL
-                        | BL_MASK_FOODPOIS | BL_MASK_TERMILL },
-    { "minor_troubles", BL_MASK_BLIND | BL_MASK_DEAF | BL_MASK_STUN
-                        | BL_MASK_CONF | BL_MASK_HALLU },
-    { "movement",       BL_MASK_LEV | BL_MASK_FLY | BL_MASK_RIDE },
-    { "moreconditions",    BL_MASK_ELF_IRON },
-};
-
 unsigned long
 query_conditions()
 {

diff --git a/src/options.c b/src/options.c
index b53f3a7af89bc4742829f7557ae0996063ad7d14..819d41409efd4a10a5ec8758e55b184e87a7fc8d 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -115,35 +115,35 @@ static const struct Bool_Opt {
     { "color", &iflags.wc_color, FALSE, SET_IN_GAME },
 #endif
     { "confirm", &flags.confirm, TRUE, SET_IN_GAME },
-    { "cond_barehanded", &condtests[bl_bareh].choice, FALSE, SET_IN_GAME },
-    { "cond_blind", &condtests[bl_blind].choice, TRUE, SET_IN_GAME },
-    { "cond_busy", &condtests[bl_busy].choice, FALSE, SET_IN_GAME },
-    { "cond_conf", &condtests[bl_conf].choice, TRUE, SET_IN_GAME },
-    { "cond_deaf", &condtests[bl_deaf].choice, TRUE, SET_IN_GAME },
-    { "cond_fly", &condtests[bl_fly].choice, TRUE, SET_IN_GAME },
-    { "cond_foodPois", &condtests[bl_foodpois].choice, TRUE, SET_IN_GAME },
-    { "cond_glowhands", &condtests[bl_glowhands].choice, FALSE, SET_IN_GAME },
-    { "cond_grab", &condtests[bl_grab].choice, TRUE, SET_IN_GAME },
-    { "cond_hallu", &condtests[bl_hallu].choice, TRUE, SET_IN_GAME },
-    { "cond_held", &condtests[bl_held].choice, FALSE, SET_IN_GAME },
-    { "cond_ice" , &condtests[bl_icy].choice, FALSE, SET_IN_GAME },
-    { "cond_iron", &condtests[bl_elf_iron].choice, TRUE, SET_IN_GAME },
-    { "cond_lava", &condtests[bl_inlava].choice, TRUE, SET_IN_GAME },
-    { "cond_lev", &condtests[bl_lev].choice, TRUE, SET_IN_GAME },
-    { "cond_unconscious", &condtests[bl_unconsc].choice, FALSE, SET_IN_GAME },
-    { "cond_paralyze", &condtests[bl_parlyz].choice, FALSE, SET_IN_GAME },
-    { "cond_ride", &condtests[bl_ride].choice, TRUE, SET_IN_GAME },
-    { "cond_sleep" , &condtests[bl_sleeping].choice, FALSE, SET_IN_GAME },
-    { "cond_slime", &condtests[bl_slime].choice, TRUE, SET_IN_GAME },
-    { "cond_slip", &condtests[bl_slippery].choice, FALSE, SET_IN_GAME },
-    { "cond_stone", &condtests[bl_stone].choice, TRUE, SET_IN_GAME },
-    { "cond_strngl", &condtests[bl_strngl].choice, TRUE, SET_IN_GAME },
-    { "cond_stun", &condtests[bl_stun].choice, TRUE, SET_IN_GAME },
-    { "cond_submerged" , &condtests[bl_submerged].choice, FALSE, SET_IN_GAME },
-    { "cond_termIll", &condtests[bl_termill].choice, TRUE, SET_IN_GAME },
-    { "cond_tethered", &condtests[bl_tethered].choice, FALSE, SET_IN_GAME },
-    { "cond_trap", &condtests[bl_trapped].choice, FALSE, SET_IN_GAME },
-    { "cond_woundedl", &condtests[bl_woundedl].choice, FALSE, SET_IN_GAME },
+    { "cond_barehanded", &condtests[bl_bareh].choice, opt_in, SET_IN_GAME },
+    { "cond_blind", &condtests[bl_blind].choice, opt_out, SET_IN_GAME },
+    { "cond_busy", &condtests[bl_busy].choice, opt_in, SET_IN_GAME },
+    { "cond_conf", &condtests[bl_conf].choice, opt_out, SET_IN_GAME },
+    { "cond_deaf", &condtests[bl_deaf].choice, opt_out, SET_IN_GAME },
+    { "cond_fly", &condtests[bl_fly].choice, opt_out, SET_IN_GAME },
+    { "cond_foodPois", &condtests[bl_foodpois].choice, opt_out, SET_IN_GAME },
+    { "cond_glowhands", &condtests[bl_glowhands].choice, opt_in, SET_IN_GAME },
+    { "cond_grab", &condtests[bl_grab].choice, opt_out, SET_IN_GAME },
+    { "cond_hallu", &condtests[bl_hallu].choice, opt_out, SET_IN_GAME },
+    { "cond_held", &condtests[bl_held].choice, opt_in, SET_IN_GAME },
+    { "cond_ice" , &condtests[bl_icy].choice, opt_in, SET_IN_GAME },
+    { "cond_iron", &condtests[bl_elf_iron].choice, opt_out, SET_IN_GAME },
+    { "cond_lava", &condtests[bl_inlava].choice, opt_out, SET_IN_GAME },
+    { "cond_lev", &condtests[bl_lev].choice, opt_out, SET_IN_GAME },
+    { "cond_unconscious", &condtests[bl_unconsc].choice, opt_in, SET_IN_GAME },
+    { "cond_paralyze", &condtests[bl_parlyz].choice, opt_in, SET_IN_GAME },
+    { "cond_ride", &condtests[bl_ride].choice, opt_out, SET_IN_GAME },
+    { "cond_sleep" , &condtests[bl_sleeping].choice, opt_in, SET_IN_GAME },
+    { "cond_slime", &condtests[bl_slime].choice, opt_out, SET_IN_GAME },
+    { "cond_slip", &condtests[bl_slippery].choice, opt_in, SET_IN_GAME },
+    { "cond_stone", &condtests[bl_stone].choice, opt_out, SET_IN_GAME },
+    { "cond_strngl", &condtests[bl_strngl].choice, opt_out, SET_IN_GAME },
+    { "cond_stun", &condtests[bl_stun].choice, opt_out, SET_IN_GAME },
+    { "cond_submerged" , &condtests[bl_submerged].choice, opt_in, SET_IN_GAME },
+    { "cond_termIll", &condtests[bl_termill].choice, opt_out, SET_IN_GAME },
+    { "cond_tethered", &condtests[bl_tethered].choice, opt_in, SET_IN_GAME },
+    { "cond_trap", &condtests[bl_trapped].choice, opt_in, SET_IN_GAME },
+    { "cond_woundedl", &condtests[bl_woundedl].choice, opt_in, SET_IN_GAME },
     { "dark_room", &flags.dark_room, TRUE, SET_IN_GAME },
     { "eight_bit_tty", &iflags.wc_eight_bit_input, FALSE, SET_IN_GAME }, /*WC*/
 #if defined(TTY_GRAPHICS) || defined(CURSES_GRAPHICS) || defined(X11_GRAPHICS)