Ticket #1373: diff.txt

File diff.txt, 1.4 KB (added by eddiegrove, 9 years ago)
Line 
1diff --git a/src/ui-options.c b/src/ui-options.c
2index 291e3d9..d5befe8 100644
3--- a/src/ui-options.c
4+++ b/src/ui-options.c
5@@ -1407,14 +1407,22 @@ static int squelch_collect_kind(int tval, squelch_choice **ch)
6                if (!k_ptr->name || k_ptr->tval != tval)
7                        continue;
8 
9-               if (!k_ptr->aware)
10+               /* XXX Eddie need to check !k_ptr->alloc_prob to avoid non-produced stuff
11+                * such as Turbulence, but then artifact flavors are not amongst unaware
12+                * flavors, so you know any flavor not in squelch list is an artifact. */
13+
14+               if ((!k_ptr->aware) && (of_has(k_ptr->flags, OF_INSTA_ART) || k_ptr->alloc_prob))
15                {
16                        /* can unaware squelch anything */
17                        choice[num].kind = k_ptr;
18                        choice[num++].aware = FALSE;
19                }
20 
21-               if (k_ptr->everseen || k_ptr->tval == TV_GOLD)
22+               if (of_has(k_ptr->flags, OF_INSTA_ART)) continue;
23+               if (!k_ptr->alloc_prob) continue;
24+
25+
26+               if (STYLE_PRESENT_EDIT_INFO || k_ptr->everseen || k_ptr->tval == TV_GOLD)
27                {
28                        /* aware squelch requires everseen */
29                        /* do not require awareness for aware squelch, so people can set at game start */
30@@ -1495,7 +1503,7 @@ static bool seen_tval(int tval)
31 
32                /* Skip empty objects, unseen objects, and incorrect tvals */
33                if (!k_ptr->name) continue;
34-               if (!k_ptr->everseen) continue;
35+               if (!k_ptr->everseen && !STYLE_PRESENT_EDIT_INFO) continue;
36                if (k_ptr->tval != tval) continue;
37 
38                 return TRUE;