Changeset 990

Show
Ignore:
Timestamp:
09/23/08 14:54:31 (4 months ago)
Author:
takkaria
Message:

(#610/#626/#624) Various fixes, thanks to "Irashtar" (http://angband.oook.cz/forum/showthread.php?t=941):

  • Fix adamantite pieces being picked up
  • Differentiate terror and afraid when displaying
  • change "3 silver pieces worth of gold" to "3 gold pieces worth of silver"
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/obj-desc.c

    r918 r990  
    725725        if (o_ptr->tval == TV_GOLD) 
    726726        { 
    727                 return strnfmt(buf, max, "%d %s pieces worth of gold", o_ptr->pval, 
     727                return strnfmt(buf, max, "%d gold pieces worth of %s", o_ptr->pval, 
    728728                               k_name + k_ptr->name); 
    729729        } 

  • trunk/src/tvalsval.h

    r938 r990  
    341341        SV_ADAMANTITE = 10, 
    342342 
    343         SV_GOLD_MAX = 10 
     343        SV_GOLD_MAX 
    344344}; 
    345345 

  • trunk/src/xtra3.c

    r985 r990  
    691691        { TMD_CONFUSED,  S("Confused"),   TERM_ORANGE }, 
    692692        { TMD_AFRAID,    S("Afraid"),     TERM_ORANGE }, 
    693         { TMD_AFRAID,    S("Terror"),     TERM_ORANGE }, 
     693        { TMD_TERROR,    S("Terror"),     TERM_RED }, 
    694694        { TMD_IMAGE,     S("Halluc"),     TERM_ORANGE }, 
    695695        { TMD_POISONED,  S("Poisoned"),   TERM_ORANGE },