Changeset 338

Timestamp:

07/14/07 08:43:03 (1 year ago)

Author:

ajps

Message:

Tidying up of the knowledge screens some more, so that recalled text is always at the top of the screen and (hopefully) no more artifact spoilers as the artifact_known check has been improved. Closes #255.

Files:

• branches/angband-3.0.8/src/cmd4.c (modified) (17 diffs)

branches/angband-3.0.8/src/cmd4.c

@@ -343 +343 @@
-}
-
+static const char *recall_prompt(int oid)
+{
+        return ", 'r' to recall";
+}
-
-#define swap(a, b) (swapspace = (void*)(a)), ((a) = (b)), ((b) = swapspace)
@@ -548 +552 @@
-                        else if (o_funcs.xattr) pvs = ", 'v' for visuals";
-
-
+
+
+
-                }
-
@@ -1035 +1041 @@
-static byte *m_xattr(int oid) { return &r_info[default_join[oid].oid].x_attr; }
-static const char *race_name(int gid) { return monster_group[gid].name; }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void mon_summary(int gid, const int *object_list, int n, int top, int row, int col)
@@ -1099 +1124 @@
-                                                        m_cmp_race, default_group, mon_summary};
-
-0
+recall_prompt
-
-        
@@ -1155 +1180 @@
-/* Many-to-one grouping */
-
-
-
-
-
-
-
+
+
-        object_type object_type_body;
-        object_type *o_ptr = &object_type_body;
-
+        /* Make fake artifact */
+        o_ptr = &object_type_body;
+        object_wipe(o_ptr);
+        make_fake_artifact(o_ptr, a_idx);
+
+        /* Get its name */
+        object_desc_spoil(o_name, namelen, o_ptr, TRUE, 0);
+}
+
+/*
+ * Display an artifact label
+ */
+static void display_artifact(int col, int row, bool cursor, int oid)
+{
+        char o_name[80];
+
-        /* Choose a color */
-        byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        /* Display the name */
@@ -1208 +1235 @@
-        screen_save();
-
+        Term_gotoxy(0, 0);
-        object_info_screen(o_ptr);
-
@@ -1233 +1261 @@
-static int art2gid(int oid) { return obj_group_order[a_info[oid].tval]; }
-
+/* Check if the given artifact idx is something we should "Know" about */
+static bool artifact_is_known(int a_idx)
+{
+        int i;
+
+        /* Artifact doesn't exist at all, or not created yet */
+        if (!a_info[a_idx].name || a_info[a_idx].cur_num == 0) return FALSE;
+
+        /* Check all objects to see if it exists but hasn't been IDed */
+        for (i = 0; i < z_info->o_max; i++)
+        {
+                int a = o_list[i].name1;
+
+                /* If we haven't actually identified the artifact yet */
+                if (a && a == a_idx && !object_known_p(&o_list[i]))
+                {
+                        return FALSE;
+                }
+        }
+
+        /* Check inventory for the same */
+        for (i = 0; i < INVEN_TOTAL; i++)
+        {
+                object_type *o_ptr = &inventory[i];
+
+                /* Ignore non-objects */
+                if (!o_ptr->k_idx) continue;
+
+
+                if (o_ptr->name1 && o_ptr->name1 == a_idx && 
+                    !object_known_p(o_ptr))
+                {
+                        return FALSE;
+                }
+        }
+
+        return TRUE;
+}
+ 
-
-/* If 'artifacts' is NULL, it counts the number of known artifacts, otherwise
@@ -1239 +1306 @@
-{
-        int a_count = 0;
-i, 
+
-
-        if (artifacts)
@@ -1246 +1313 @@
-        for (j = 0; j < z_info->a_max; j++)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                }
-        }
@@ -1282 +1335 @@
-        /* HACK -- should be TV_MAX */
-        group_funcs obj_f = {TV_GOLD, FALSE, kind_name, a_cmp_tval, art2gid, 0};
-0
+recall_prompt
-
-        int *artifacts;
@@ -1342 +1395 @@
-        /* Begin recall */
-        Term_gotoxy(0, 1);
+        text_out("\n");
+
-        if (e_ptr->text)
-        {
@@ -1369 +1424 @@
-        Term_flush();
-
-
+
+
-
-        screen_load();
@@ -1396 +1452 @@
-                {TV_GOLD, FALSE, ego_grp_name, e_cmp_tval, default_group, 0};
-
-0
+recall_prompt
-
-        int *egoitems;
@@ -1432 +1488 @@
-/* =================== ORDINARY OBJECTS  ==================================== */
-/* Many-to-one grouping */
+
+/*
+ * Looks up an artifact idx given an object_kind *that's already known
+ * to be an artifact*.  Behaviour is distinctly unfriendly if passed
+ * flavours which don't correspond to an artifact.
+ */
+static int get_artifact_from_kind(object_kind *k_ptr)
+{
+        int i;
+
+        assert(k_ptr->flags3 & TR3_INSTA_ART);
+
+        /* Look for the corresponding artifact */
+        for (i = 0; i < z_info->a_max; i++)
+        {
+                if (k_ptr->tval == a_info[i].tval &&
+                    k_ptr->sval == a_info[i].sval)
+                {
+                        break;
+                }
+        }
+
+        assert(i < z_info->a_max);
+        return i;
+}
-
-/*
@@ -1460 +1541 @@
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        /* Display the name */
@@ -1485 +1574 @@
-static void desc_obj_fake(int k_idx)
-{
+        object_kind *k_ptr = &k_info[k_idx];
-        object_type object_type_body;
-        object_type *o_ptr = &object_type_body;
+
+        /* Check for known artifacts, display them as artifacts */
+        if ((k_ptr->flags3 & TR3_INSTA_ART) && artifact_is_known(get_artifact_from_kind(k_ptr)))
+        {
+                desc_art_fake(get_artifact_from_kind(k_ptr));
+                return;
+        }
-
-        /* Wipe the object */
@@ -1568 +1665 @@
-        object_kind *k_ptr = &k_info[oid];
-        s16b idx = get_autoinscription_index(oid);
-
-
-
+
+r' to recall, '
+r' to recall, '
-
-