Changeset 169

Timestamp:

06/09/07 08:26:51 (1 year ago)

Author:

takkaria

Message:

Fix some menu bugs (#128):

• Options submenus should use a, b, c etc.
  
• Macro menu doesn't have the right indentation.
  
• Birthscreen menu for race/class has cursor in wrong place (should be on the grid of the selected menu item).
  

Files:

• trunk/src/birth.c (modified) (3 diffs)
• trunk/src/cmd4.c (modified) (9 diffs)
• trunk/src/ui.c (modified) (6 diffs)

trunk/src/birth.c

@@ -727 +727 @@
-{
-        byte attr = curs_attrs[CURS_KNOWN][0 != cursor];
-rt
+ut_str
-}
-
@@ -741 +741 @@
-{
-        byte attr = curs_attrs[CURS_KNOWN][0 != cursor];
-rt
+ut_str
-}
-
@@ -755 +755 @@
-{
-        byte attr = curs_attrs[0 != (rp_ptr->choice & (1L << oid))][0 != cursor];
-rt
+ut_str
-}
-

trunk/src/cmd4.c

@@ -2935 +2935 @@
-        int cursor = 0;
-
-1, 0, 11
+0, 0, 12
-
-        /* Roguelike */
@@ -2953 +2953 @@
-        FILE_TYPE(FILE_TYPE_TEXT);
-
-
-        screen_save();
-
@@ -2967 +2966 @@
-                clear_from(0);
-
-                /* No title -- this is a complex menu. */
-                prt("Interact with macros", 0, 0);
-                /* Describe current action */
-
+
+
-                /* Analyze the current action */
-                ascii_to_text(tmp, sizeof(tmp), macro_buffer);
+
-                /* Display the current action */
-3
+4
-                c = menu_select(&macro_menu, &cursor, EVT_CMD);
-
-
-       
+
+if (ESCAPE == c.key) 
-                evt = macro_actions[cursor].id;
-
-
+
+
-                case LOAD_PREF:
+                {
-                        do_cmd_pref_file_hack(16);
-                        break;
+                }
-
-#ifdef ALLOW_MACROS
@@ -3070 +3072 @@
-                        break;
-                }
+
-                case DEL_MACRO:
-                {
@@ -4166 +4169 @@
-        menu_type *menu;
-
+        /* options screen selection menu */
+        menu = &option_menu;
+        WIPE(menu, menu_type);
+        menu_set_id(menu, OPTION_MENU);
+        menu->title = "Options Menu";
+        menu->menu_data = option_actions;
+        menu->count = N_ELEMENTS(option_actions);
+        menu_init(menu, MN_SCROLL, MN_ACT, &SCREEN_REGION);
+
-        /* Initialize the options toggle menu */
-        menu = &option_toggle_menu;
@@ -4171 +4183 @@
-        menu->prompt = "Set option (y/n/t), '?' for information";
-        menu->cmd_keys = "?YyNnTt";
-default_choice
+"abcdefghijklmopqrsuvwxz"
-        menu->count = OPT_PAGE_PER;
-        menu->flags = MN_DBL_TAP;
-        menu_init2(menu, find_menu_skin(MN_SCROLL), &options_iter, &SCREEN_REGION);
-
-        /* options screen selection menu */
-        menu = &option_menu;
-        WIPE(menu, menu_type);
-        menu_set_id(menu, OPTION_MENU);
-        menu->title = "Options Menu";
-        menu->count = N_ELEMENTS(option_actions);
-        menu->menu_data = option_actions;
-        menu_init(menu, MN_SCROLL, MN_ACT, &SCREEN_REGION);
-
-        /* macro menu */
@@ -4189 +4192 @@
-        WIPE(menu, menu_type);
-        menu_set_id(menu, MACRO_MENU);
+        menu->title = "Interact with macros";
+        menu->selections = default_choice;
+        menu->menu_data = macro_actions;
-        menu->count = N_ELEMENTS(macro_actions);
-        menu->menu_data = macro_actions;
-        menu->selections = lower_case;
-        menu_init(menu, MN_SCROLL, MN_EVT, &SCREEN_REGION);
-
-        /* knowledge menu */
-        menu = &knowledge_menu;
-        WIPE(menu, menu_type);
-        menu_set_id(menu, KNOWLEDGE_MENU);
-        menu->title = "Display current knowledge";
-        menu->count = N_ELEMENTS(knowledge_actions),
-        menu->menu_data = knowledge_actions;
-        menu_init(menu, MN_SCROLL, MN_ACT, &SCREEN_REGION);
-        
-        /* visuals menu */
-        menu = &visual_menu;
@@ -4209 +4204 @@
-        menu->title = "Interact with visuals";
-        menu->selections = default_choice;
+        menu->menu_data = visual_menu_items;
-        menu->count = N_ELEMENTS(visual_menu_items);
-        menu->menu_data = visual_menu_items; 
-        menu_init(menu, MN_SCROLL, MN_EVT, &SCREEN_REGION);
-
@@ -4219 +4214 @@
-        menu->title = "Interact with colors";
-        menu->selections = default_choice;
-        menu->count = N_ELEMENTS(color_events),
-        menu->menu_data = color_events;
+        menu->count = N_ELEMENTS(color_events);
-        menu_init(menu, MN_SCROLL, MN_EVT, &SCREEN_REGION);
+
+        /* knowledge menu */
+        menu = &knowledge_menu;
+        WIPE(menu, menu_type);
+        menu_set_id(menu, KNOWLEDGE_MENU);
+        menu->title = "Display current knowledge";
+        menu->menu_data = knowledge_actions;
+        menu->count = N_ELEMENTS(knowledge_actions),
+        menu_init(menu, MN_SCROLL, MN_ACT, &SCREEN_REGION);
-
-        /* initialize other static variables */

trunk/src/ui.c

@@ -17 +17 @@
- */
-#include "angband.h"
-
-
-/*
@@ -333 +332 @@
-
-/* Display current view of a skin */
-
-
+
-{
-        int col = loc->col;
@@ -342 +340 @@
-        int i;
-
-
+
+
-                if(menu->flags & MN_PAGE) *top = cursor;
-                else *top = cursor - jumpscroll - 1;
-        }
-
-
+
+
+
+
-                        *top = cursor;
-(menu->flags & MN_PAGE) 
+ (menu->flags & MN_PAGE)
-                        *top = n - rows_per_page;
-                else 
-                        *top = cursor - (rows_per_page - 1) + 1 + jumpscroll;
-        }
+
-        if (*top > n - rows_per_page)
-                *top = n - rows_per_page;
@@ -366 +368 @@
-        }
-
-
+menu->
-                Term_gotoxy(col, row + cursor - *top);
-}
@@ -553 +555 @@
-
-/* Modal display of menu */
-
-
-
+
+
-{
-        int flags = menu->flags;
@@ -604 +605 @@
-                                        TERM_WHITE, menu->prompt);
-
-        menu->skin->display_list(menu, menu->cursor, &menu->top, &menu->active);
-
-        if (menu->browse_hook && oid >= 0)
-                menu->browse_hook(oid, (void*) menu->menu_data, loc);
+
+        menu->skin->display_list(menu, menu->cursor, &menu->top, &menu->active);
-}
-