PennMUSH Community

Changeset 1034

Show
Ignore:
Timestamp:
07/08/07 20:56:42 (1 year ago)
Author:
shawnw
Message:

#7397: Default attribute flags

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/CHANGES.183

    r1008 r1034  
    7878    common cases by Sketch and Javelin. 
    7979  * Fixes to ANSI output where extra ^[[m were being sent. 
     80  * Default flags weren't getting set on some attributes in certain 
     81    cases. Report by Talvo. 
    8082  * Fixes from 1.8.2p6 
    8183 

  • 1.8.3/branches/devel/game/txt/hlp/pennv183.hlp

    r1025 r1034  
    7575    common cases by Sketch and Javelin. 
    7676  * Fixes to ANSI output where extra ^[[m were being sent. 
     77  * Default flags weren't getting set on some attributes in certain 
     78    cases. Report by Talvo. 
    7779  * Fixes from 1.8.2p6 
    7880 

  • 1.8.3/branches/devel/src/attrib.c

    r967 r1034  
    394394  do { \ 
    395395    ATTR *std = atr_match(AL_NAME((atr))); \ 
    396     if (std && !(flags) && !strcmp(AL_NAME(std), AL_NAME((atr)))) {   \ 
    397       AL_FLAGS(atr) = AL_FLAGS(std); \ 
     396    if (std && !strcmp(AL_NAME(std), AL_NAME((atr)))) {   \ 
     397      AL_FLAGS(atr) = AL_FLAGS(std) | flags; \ 
    398398    } else { \ 
    399399        AL_FLAGS(atr) = flags; \