Changeset 67

Show
Ignore:
Timestamp:
04/22/07 23:53:32 (2 years ago)
Author:
pmac
Message:

Fix various problems with menu prompts in store.
Also make some functions static (from code review)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/store.c

    r65 r67  
    18201820                text_out("the store's"); 
    18211821 
    1822         text_out(" inventory, '"); 
     1822        text_out(" inventory, or '"); 
     1823        text_out_c(TERM_L_GREEN, "space"); 
     1824        text_out("' to advance to the next page;"); 
     1825         
    18231826 
    18241827        if (rogue_like_commands) 
    …… 
    28832886                        /* These two can't intersect! */ 
    28842887                        menu.cmd_keys = "\t\n\x10\r{}gIepw"; 
    2885                         menu.selections = "abcfhijklmnoqrstuvxyz1234567890"; 
     2888                        menu.selections = "abcfhijklmnoqrstuvxyz1234567890ABCDEFGHIJKL"; 
    28862889                } 
    28872890                menu.flags |= MN_PAGE; 
    …… 
    28902893                items_region.page_rows = scr_places_y[LOC_ITEMS_END] - scr_places_y[LOC_ITEMS_START] + 1; 
    28912894                menu_init2(&menu, find_menu_skin(MN_SCROLL), cur_menu, &items_region); 
     2895                if(menu.count >= menu.active.page_rows) { 
     2896                        menu.prompt = "--more--"; 
     2897                        menu_layout(&menu, &menu.boundary); 
     2898                } 
    28922899 
    28932900                /* Get a selection/action */ 

  • trunk/src/xtra1.c

    r59 r67  
    28842884/* Some simple wrapper functions, done somewhat lazily */ 
    28852885#define PRT_STAT(N, n) \ 
    2886         void N(int row, int col) { prt_stat(n, row, col); } 
     2886        static void N(int row, int col) { prt_stat(n, row, col); } 
    28872887 
    28882888PRT_STAT(prt_str, A_STR) 
    …… 
    28932893PRT_STAT(prt_chr, A_CHR) 
    28942894 
    2895 void prt_race(int row, int col) { prt_field(p_name + rp_ptr->name, row, col); } 
    2896 void prt_class(int row, int col) { prt_field(c_name + cp_ptr->name, row, col); } 
     2895static void prt_race(int row, int col) { prt_field(p_name + rp_ptr->name, row, col); } 
     2896static void prt_class(int row, int col) { prt_field(c_name + cp_ptr->name, row, col); } 
    28972897 
    28982898 
    …… 
    29052905 * disappear in the order of lowest to highest importance. 
    29062906 */ 
    2907 void prt_side(void) 
     2907static void prt_side(void) 
    29082908{ 
    29092909        struct sidebar_entry