Changeset 1461 for trunk

Timestamp:

07/02/09 22:14:31 (14 months ago)

Author:

takkaria

Message:

Rough sketch of using the object knowledge menu for setting sval squelch.

Files:

• trunk/src/cmd-know.c (modified) (9 diffs)

trunk/src/cmd-know.c

@@ -464 +464 @@
 
                         if (otherfields)
-                                prt(otherfields, 4, 55);
+                                prt(otherfields, 4, 46);
 
 
@@ -1167 +1167 @@
 
         display_knowledge("monsters", monsters, m_count, r_funcs, m_funcs,
-                                                "          Sym  Kills");
+                        "                   Sym  Kills");
         FREE(default_join);
         FREE(monsters);
@@ -1347 +1347 @@
         a_count = collect_known_artifacts(artifacts, z_info->a_max);
 
-        display_knowledge("artifacts", artifacts, a_count, obj_f, art_f, 0);
+        display_knowledge("artifacts", artifacts, a_count, obj_f, art_f, NULL);
         FREE(artifacts);
 }
@@ -1482 +1482 @@
         }
 
-        display_knowledge("ego items", egoitems, e_count, obj_f, ego_f, "");
+        display_knowledge("ego items", egoitems, e_count, obj_f, ego_f, NULL);
 
         FREE(default_join);
@@ -1554 +1554 @@
         /* Display the name */
         c_prt(attr, o_name, row, col);
+
+        /* Show squelch status */
+        if (k_ptr->squelch)
+                c_put_str(attr, "Yes", row, 46);
 
         /* Show autoinscription if around */
@@ -1684 +1688 @@
         s16b idx = get_autoinscription_index(oid);
 
-        const char *no_insc = ", 'r' to recall, '{'";
-        const char *with_insc = ", 'r' to recall, '{', '}'";
+        const char *no_insc = ", 's' to toggle squelch, 'r'ecall, '{'";
+        const char *with_insc = ", 's' to toggle squelch, 'r'ecall, '{', '}'";
 
 
@@ -1707 +1711 @@
         s16b idx = get_autoinscription_index(oid);
 
+        /* Toggle squelch */
+        if (ch == 's' || ch == 'S')
+        {
+                if (squelch_tval(k_ptr->tval))
+                        k_ptr->squelch = !k_ptr->squelch;
+                return;
+        }
+
         /* Forget it if we've never seen the thing */
         if (k_ptr->flavor && !k_ptr->aware)
@@ -1782 +1794 @@
         }
 
-        display_knowledge("known objects", objects, o_count, kind_f, obj_f, "Inscribed          Sym");
+        display_knowledge("known objects", objects, o_count, kind_f, obj_f, "Squelch  Inscribed          Sym");
 
         FREE(objects);
@@ -1865 +1877 @@
         }
 
-        display_knowledge("features", features, f_count, fkind_f, feat_f, "           Sym");
+        display_knowledge("features", features, f_count, fkind_f, feat_f,
+                "                    Sym");
         FREE(features);
 }