Changeset 656

Show
Ignore:
Timestamp:
01/29/08 04:58:19 (10 months ago)
Author:
takkaria
Message:

Use the MDESC_* flags where appropriate rather than magic numbers. (closes #429)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/melee1.c

    r653 r656  
    160160 
    161161        /* Get the "died from" information (i.e. "a kobold") */ 
    162         monster_desc(ddesc, sizeof(ddesc), m_ptr, 0x88); 
    163  
     162        monster_desc(ddesc, sizeof(ddesc), m_ptr, MDESC_SHOW | MDESC_IND2); 
    164163 
    165164        /* Assume no blink */ 

  • trunk/src/melee2.c

    r653 r656  
    798798 
    799799        /* Get the monster possessive ("his"/"her"/"its") */ 
    800         monster_desc(m_poss, sizeof(m_poss), m_ptr, 0x22); 
     800        monster_desc(m_poss, sizeof(m_poss), m_ptr, MDESC_PRO2 | MDESC_POSS); 
    801801 
    802802        /* Hack -- Get the "died from" name */ 
    803         monster_desc(ddesc, sizeof(ddesc), m_ptr, 0x88); 
     803        monster_desc(ddesc, sizeof(ddesc), m_ptr, MDESC_SHOW | MDESC_IND2); 
    804804 
    805805 
    …… 
    34503450                                /* Get the monster name/poss */ 
    34513451                                monster_desc(m_name, sizeof(m_name), m_ptr, 0); 
    3452                                 monster_desc(m_poss, sizeof(m_poss), m_ptr, 0x22); 
     3452                                monster_desc(m_poss, sizeof(m_poss), m_ptr, MDESC_PRO2 | MDESC_POSS); 
    34533453 
    34543454                                /* Dump a message */ 
    …… 
    38983898 
    38993899                                        /* Get the monster name */ 
    3900                                         monster_desc(m_name, sizeof(m_name), m_ptr, 0x04); 
     3900                                        monster_desc(m_name, sizeof(m_name), m_ptr, MDESC_IND1); 
    39013901 
    39023902                                        /* React to objects that hurt the monster */ 

  • trunk/src/spells1.c

    r653 r656  
    33723372 
    33733373        /* Get the monster's real name */ 
    3374         monster_desc(killer, sizeof(killer), m_ptr, 0x88); 
     3374        monster_desc(killer, sizeof(killer), m_ptr, MDESC_SHOW | MDESC_IND2); 
    33753375 
    33763376 

  • trunk/src/spells2.c

    r653 r656  
    23232323 
    23242324                        /* Get "the monster" or "something" */ 
    2325                         monster_desc(m_name, sizeof(m_name), m_ptr, 0x04); 
     2325                        monster_desc(m_name, sizeof(m_name), m_ptr, MDESC_IND1); 
    23262326 
    23272327                        /* Describe the monster */ 

  • trunk/src/xtra2.c

    r653 r656  
    14901490                        char unique_name[80]; 
    14911491                        r_ptr->max_num = 0; 
    1492                          
     1492 
    14931493                        /* This gets the correct name if we slay an invisible unique and don't have See Invisible. */ 
    1494                         monster_desc(unique_name, sizeof(unique_name), m_ptr, 0x88); 
     1494                        monster_desc(unique_name, sizeof(unique_name), m_ptr, MDESC_SHOW | MDESC_IND2); 
    14951495 
    14961496                        /* Log the slaying of a unique */ 
    …… 
    14981498                        history_add(buf, HISTORY_SLAY_UNIQUE, 0); 
    14991499                } 
    1500                          
     1500 
    15011501                /* Gain experience */ 
    15021502                gain_exp(new_exp); 
    …… 
    24962496 
    24972497                                /* Get the monster name ("a kobold") */ 
    2498                                 monster_desc(m_name, sizeof(m_name), m_ptr, 0x08); 
     2498                                monster_desc(m_name, sizeof(m_name), m_ptr, MDESC_IND2); 
    24992499 
    25002500                                /* Hack -- track this monster race */