Changeset 1005

Show
Ignore:
Timestamp:
10/01/08 03:58:17 (3 months ago)
Author:
takkaria
Message:
  • Fix silly logic error in player/calcs.c.
  • Make "You are too afraid to attack x!" messages orange by default.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/pref/message.prf

    r918 r1005  
    120120M:29:o 
    121121 
     122# MSG_AFRAID 
     123M:56:o 
     124 
    122125?:1 
    123126 

  • trunk/src/attack.c

    r999 r1005  
    455455        { 
    456456                /* Message */ 
    457                 msg_format("You are too afraid to attack %s!", m_name); 
     457                message_format(MSG_AFRAID, 0, "You are too afraid to attack %s!", m_name); 
    458458 
    459459                /* Done */ 

  • trunk/src/player/calcs.c

    r1000 r1005  
    628628                /* Extract the item flags */ 
    629629                object_flags(o_ptr, &f1, &f2, &f3); 
    630                 collect_f1 &= f1; 
    631                 collect_f2 &= f2; 
    632                 collect_f3 &= f3; 
     630                collect_f1 |= f1; 
     631                collect_f2 |= f2; 
     632                collect_f3 |= f3; 
    633633 
    634634                /* Affect stats */