Changeset 485

Show
Ignore:
Timestamp:
08/10/07 09:28:38 (1 year ago)
Author:
ajps
Message:

Changes to get the map display back to normal for flavoured items after [472] and co.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/cave.c

    r483 r485  
    644644                         
    645645                        /* Normal attr and char */ 
    646                         a = k_ptr->x_attr; 
    647                         c = k_ptr->x_char; 
     646                        a = object_kind_attr(g->first_k_idx); 
     647                        c = object_kind_char(g->first_k_idx); 
    648648                         
    649649                        if (show_piles && g->multiple_objects) 

  • trunk/src/defines.h

    r479 r485  
    23732373 * Determine if a given inventory item is "aware" 
    23742374 */ 
     2375#define object_kind_aware_p(K) \ 
     2376        (k_info[(K)].aware) 
     2377 
    23752378#define object_aware_p(T) \ 
    2376         (k_info[(T)->k_idx].aware) 
     2379        (object_kind_aware_p((T)->k_idx)) 
    23772380 
    23782381/* 
    …… 
    23932396          k_info[(T)->k_idx].aware)) 
    23942397 
    2395  
    23962398/* 
    23972399 * Determine if the attr and char should consider the item's flavor 
    …… 
    23992401 * Identified scrolls should use their own tile. 
    24002402 */ 
    2401 #define use_flavor_glyph(T) \ 
    2402         ((k_info[(T)->k_idx].flavor) && \ 
    2403          !((k_info[(T)->k_idx].tval == TV_SCROLL) && object_aware_p(T))) 
    2404  
     2403#define use_flavor_glyph(K) \ 
     2404        ((k_info[(K)].flavor) && \ 
     2405         !((k_info[(K)].tval == TV_SCROLL) && object_kind_aware_p(K))) 
     2406 
     2407/* 
     2408 * Return the "attr" for a given item kind. 
     2409 * Use "flavor" if available. 
     2410 * Default to user definitions. 
     2411 */ 
     2412#define object_kind_attr(K) \ 
     2413        (use_flavor_glyph(K) ? \ 
     2414         (flavor_info[k_info[(K)].flavor].x_attr) : \ 
     2415         (k_info[(K)].x_attr)) 
     2416 
     2417/* 
     2418 * Return the "char" for a given item kind. 
     2419 * Use "flavor" if available. 
     2420 * Default to user definitions. 
     2421 */ 
     2422#define object_kind_char(K) \ 
     2423        (use_flavor_glyph(K) ? \ 
     2424         (flavor_info[k_info[(K)].flavor].x_char) : \ 
     2425         (k_info[(K)].x_char)) 
    24052426 
    24062427/* 
    …… 
    24102431 */ 
    24112432#define object_attr(T) \ 
    2412         (use_flavor_glyph(T) ? \ 
    2413          (flavor_info[k_info[(T)->k_idx].flavor].x_attr) : \ 
    2414          (k_info[(T)->k_idx].x_attr)) 
     2433        (object_kind_attr((T)->k_idx)) 
    24152434 
    24162435/* 
    …… 
    24202439 */ 
    24212440#define object_char(T) \ 
    2422         (use_flavor_glyph(T) ? \ 
    2423          (flavor_info[k_info[(T)->k_idx].flavor].x_char) : \ 
    2424          (k_info[(T)->k_idx].x_char)) 
     2441        (object_kind_char((T)->k_idx)) 
    24252442 
    24262443