Changeset 383

Show
Ignore:
Timestamp:
07/27/07 16:57:01 (1 year ago)
Author:
takkaria
Message:

Make graphics for flavoured items work properly. (fixes #293)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/angband-3.0.8/src/cmd4.c

    r358 r383  
    15271527 
    15281528        /* Choose a color */ 
    1529         bool aware = (k_ptr->flavor == 0) || (k_ptr->aware); 
    1530         byte a = (aware && k_ptr->x_attr) ? 
    1531                                 k_ptr->x_attr : flavor_info[k_ptr->flavor].x_attr; 
    1532         byte c = aware ? k_ptr->x_char : flavor_info[k_ptr->flavor].x_char; 
    1533         byte attr = curs_attrs[(int)k_ptr->flavor == 0 || k_ptr->aware][(int)cursor]; 
    1534  
    1535         /* Symbol is unknown.  This should never happen.*/       
    1536         if (!k_ptr->aware && !k_ptr->flavor && !p_ptr->wizard) 
    1537         { 
    1538                 assert(0); 
    1539                 c = ' '; 
    1540                 a = TERM_DARK; 
    1541         } 
     1529        bool aware = (!k_ptr->flavor || k_ptr->aware); 
     1530        byte attr = curs_attrs[(int)aware][(int)cursor]; 
     1531 
     1532        /* Find graphics bits -- versions of the object_char and object_attr defines */ 
     1533        bool use_flavour = (k_ptr->flavor) && !(aware && k_ptr->tval == TV_SCROLL); 
     1534 
     1535        byte a = use_flavour ? flavor_info[k_ptr->flavor].x_attr : k_ptr->x_attr; 
     1536        byte c = use_flavour ? flavor_info[k_ptr->flavor].x_char : k_ptr->x_char; 
    15421537 
    15431538        /* Display known artifacts differently */ 
     
    15491544        { 
    15501545                /* Tidy name */ 
    1551                 object_kind_name(o_name, sizeof o_name, k_idx, cheat_know); 
     1546                object_kind_name(o_name, sizeof(o_name), k_idx, cheat_know); 
    15521547        } 
    15531548