Changeset 254

Timestamp:

07/03/07 17:29:00 (1 year ago)

Author:

ajps

Message:

Fixes to some store oddities, and making it clearer when knowledge menu items won't do anything. All going towards #170.

Files:

• trunk/src/cmd4.c (modified) (12 diffs)
• trunk/src/store.c (modified) (6 diffs)
• trunk/src/ui.h (modified) (1 diff)

trunk/src/cmd4.c

@@ -574 +574 @@
-                {
-                        display_visual_list(g_name_len + 3, 7, browser_rows-1,
-      
+                       
-                        place_visual_list_cursor(g_name_len + 3, 7, *o_funcs.xattr(oid), 
-                                                                                *o_funcs.xchar(oid), attr_top, char_left);
@@ -1064 +1064 @@
-}
-
+static int count_known_monsters(void)
+{
+        int m_count = 0;
+        int i;
+        size_t j;
+
+        for (i = 0; i < z_info->r_max; i++)
+        {
+                monster_race *r_ptr = &r_info[i];
+                if (!cheat_know && !l_list[i].sights) continue;
+                if (!r_ptr->name) continue;
+
+                if (r_ptr->flags1 & RF1_UNIQUE) m_count++;
+
+                for (j = 1; j < N_ELEMENTS(monster_group) - 1; j++)
+                {
+                        const char *pat = monster_group[j].chars;
+                        if (strchr(pat, r_ptr->d_char)) m_count++;
+                }
+        }
+
+        return m_count;
+}
+
-/*
- * Display known monsters.
- */
-
+ *obj, const char *name
-{
-        group_funcs r_funcs = {N_ELEMENTS(monster_group), FALSE, race_name,
@@ -1207 +1231 @@
-
-
+/* If 'artifacts' is NULL, it counts the number of known artifacts, otherwise
+   it collects the list of known artifacts into 'artifacts' as well. */
+static int collect_known_artifacts(int *artifacts, size_t artifacts_len)
+{
+        int a_count = 0;
+        int i, j;
+
+        if (artifacts)
+                assert(artifacts_len >= z_info->a_max);
+
+        for (j = 0; j < z_info->a_max; j++)
+        {
+                /* If the artifact has been created (or we're cheating) */
+                if ((cheat_xtra || a_info[j].cur_num) && a_info[j].name)
+                {
+                        bool valid = TRUE;
+
+                        for (i = 0; !cheat_xtra && i < z_info->o_max; i++)
+                        {
+                                int a = o_list[i].name1;
+
+                                /* If we haven't actually identified the artifact yet */
+                                if (a && a == j && !object_known_p(&o_list[i]))
+                                {
+                                        valid = FALSE;
+                                }
+                        }
+
+                        if (valid)
+                        {
+                                if (artifacts)
+                                        artifacts[a_count++] = j;
+                                else
+                                        a_count++;
+                        }
+                }
+        }
+
+        return a_count;
+}
+
-/*
- * Display known artifacts
- */
-
+ *obj, const char *name
-{
-        /* HACK -- should be TV_MAX */
@@ -1216 +1281 @@
-        member_funcs art_f = {display_artifact, desc_art_fake, 0, 0, 0, 0, 0};
-
-
-        int *artifacts;
-        int a_count = 0;
-        int i, j;
-
-        C_MAKE(artifacts, z_info->a_max, int);
-
+
-        /* Collect valid artifacts */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        display_knowledge("artifacts", artifacts, a_count, obj_f, art_f, 0);
@@ -1340 +1388 @@
- * Display known ego_items
- */
-
+ *obj, const char *name
-{
-        group_funcs obj_f =
@@ -1594 +1642 @@
- * Display known objects
- */
-
+ *obj, const char *name
-{
-        group_funcs kind_f = {TV_GOLD, FALSE, kind_name, o_cmp_tval, obj2gid, 0};
@@ -1670 +1718 @@
- * Interact with feature visuals.
- */
-
+ *obj, const char *name
-{
-        group_funcs fkind_f = {N_ELEMENTS(feature_group_text), FALSE,
@@ -1696 +1744 @@
-
-
- 
+
-{
-        /* TODO */
@@ -3023 +3071 @@
-
-                if (ESCAPE == c.key) break;
-                
+               
-                evt = macro_actions[cursor].id;
-
@@ -4008 +4056 @@
-
-
-
+static 
-{
-        /* display self knowledge we already know about. */
@@ -4019 +4067 @@
-static menu_item knowledge_actions[] =
-{
-artifact knowledge", (action_f)do_cmd_knowledge_artifa
-monster knowledge", (action_f)do_cmd_knowledge_monster
-(action_f)
-object knowledge", (action_f)do_cmd_knowledge_object
-(action_f)
+object knowledge", do_cmd_knowledge_obje
+artifact knowledge", do_cmd_knowledge_artifact
+
+monster knowledge", do_cmd_knowledge_monster
+
-        {{0, "Display self-knowledge", do_cmd_self_knowledge, 0}, '6'},
-};
@@ -4036 +4084 @@
-{
-        int cursor = 0;
+        int i;
-        event_type c = EVENT_EMPTY;
-        region knowledge_region = { 0, 0, -1, 11 };
+
+        /* Grey out menu items that won't display anything */
+        if (collect_known_artifacts(NULL, 0) > 0)
+                knowledge_actions[1].flags = 0;
+        else
+                knowledge_actions[1].flags = MN_GREYED;
+
+        knowledge_actions[2].flags = MN_GREYED;
+        for (i = 0; i < z_info->e_max; i++)
+        {
+                if (e_info[i].everseen || cheat_xtra)
+                {
+                        knowledge_actions[2].flags = 0;
+                        break;
+                }
+        }
+
+        if (count_known_monsters() > 0)
+                knowledge_actions[3].flags = 0;
+        else
+                knowledge_actions[3].flags = MN_GREYED;
-
-        screen_save();

trunk/src/store.c

@@ -2047 +2047 @@
-        const char *prompt = "Sell which item? ";
-
+        /* Clear all current messages */
+        msg_flag = FALSE;
+        prt("", 0, 0);
+
-        if (store_current == STORE_HOME)
-                prompt = "Drop which item? ";
@@ -2572 +2576 @@
-
-
-    
+       
-
-        /* XXX Take note of the store number from the terrain feature */
@@ -2579 +2583 @@
-
-
-    
+       
-
-        /* Save current screen (ie. dungeon) */
@@ -2602 +2606 @@
-
-        /* Calculate the positions of things and redraw */
+        store_flags = STORE_INIT_CHANGE;
-        store_display_recalc();
-        store_flags = STORE_INIT_CHANGE;
-        store_redraw();
-
@@ -2612 +2616 @@
-        while (!leave)
-        {
-Keep track of stock and number of rows
+As many rows in the menus as there are items in the store
-                menu.count = st_ptr->stock_num;
-                items_region.page_rows = scr_places_y[LOC_ITEMS_END] - scr_places_y[LOC_ITEMS_START] + 1;
-
-                /* These two can't intersect! */
@@ -2624 +2627 @@
-                        cursor = menu.count - 1;
-
-
-
+
-
-                /* Init the menu structure */
-                menu_init2(&menu, find_menu_skin(MN_SCROLL), cur_menu, &items_region);
-
-= menu.active
+ items_region
-                        menu.prompt = "  -more-";
-                else

trunk/src/ui.h

@@ -230 +230 @@
-        MN_DISABLED             = 0x0100000,    /* Neither action nor selection is permitted */
-        MN_GRAYED               = 0x0200000,    /* Row is displayed with CURS_UNKNOWN colors */
+        MN_GREYED               = 0x0200000,    /* Row is displayed with CURS_UNKNOWN colors */
-        MN_SELECTED             = 0x0400000,    /* Row is currently selected */
-        MN_SELECTABLE   = 0x0800000,    /* Row is permitted to be selected */