Changeset 290

Show
Ignore:
Timestamp:
07/05/07 20:08:08 (1 year ago)
Author:
takkaria
Message:

Fix display of "(squelch)" in stores. (closes #196)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/object1.c

    r274 r290  
    480480                } 
    481481        } 
     482 
     483        /* Use proper name (Healing, or whatever) */ 
    482484        else 
    483         /* Use proper name (Healing, or whatever) */ 
    484485        { 
    485486                cptr str = (k_name + k_ptr->name); 
    …… 
    649650 * such as: 
    650651 * "no more Maces of Disruption (Defender) (+10,+10) [+5] (+3 to stealth)". 
    651  
     652 * 
    652653 * Note that the object description will be clipped to fit into the given 
    653654 * buffer size. 
    …… 
    694695 *   1 -- A Cloak of Death [1,+3] 
    695696 *   2 -- An Amulet of Death [1,+3] (+2 to Stealth) 
    696  *   3 -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty} 
     697 *   3 -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty} (squelch) 
     698 *   4 -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty} 
    697699 * 
    698700 * Modes ("pref" is FALSE): 
    …… 
    700702 *   1 -- Cloak of Death [1,+3] 
    701703 *   2 -- Amulet of Death [1,+3] (+2 to Stealth) 
    702  *   3 -- Rings of Death [1,+3] (+2 to Stealth) {nifty} 
     704 *   3 -- Rings of Death [1,+3] (+2 to Stealth) {nifty} (squelch) 
     705 *   4 -- Rings of Death [1,+3] (+2 to Stealth) {nifty} 
    703706 */ 
    704707void object_desc(char *buf, size_t max, const object_type *o_ptr, int pref, int mode) 
    …… 
    16441647        } 
    16451648 
    1646         /* Add squelch marker */ 
    1647         if (!hide_squelchable && squelch_item_ok(o_ptr)) 
     1649 
     1650        /* Add squelch marker unless mode == 4 (in-store) */ 
     1651        if (mode != 4 && !hide_squelchable && squelch_item_ok(o_ptr)) 
    16481652                object_desc_str_macro(t, " (squelch)"); 
    16491653 

  • trunk/src/store.c

    r265 r290  
    16261626 
    16271627        /* Describe the object */ 
    1628         object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3); 
     1628        object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 4); 
    16291629 
    16301630        /* Display the object */