fiddlerwoaroof/crawl - Change 6GDKXNFXPKQ6AVNOSMJECN7CLELM2KCMVRM2A7BARLK2NNILN6SAC

More minor cleanups.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1378 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on April 27, 2007

6GDKXNFXPKQ6AVNOSMJECN7CLELM2KCMVRM2A7BARLK2NNILN6SAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/itemprop.h at line 30 [4.641567]

[4.642292]

bool fully_identified( const item_def &item );
unsigned long full_ident_mask( const item_def& item );

Insertion in crawl-ref/source/itemprop.cc at line 477 [4.646661]

[4.666813]

// Returns the mask of interesting identify bits for this item
// (e.g., scrolls don't have know-cursedness.)
unsigned long full_ident_mask( const item_def& item )
{
    unsigned long flagset = ISFLAG_IDENT_MASK;
    switch ( item.base_type )
    {
    case OBJ_FOOD:
        flagset = 0;
        break;
    case OBJ_BOOKS:
    case OBJ_MISCELLANY:
    case OBJ_ORBS:
    case OBJ_SCROLLS:
    case OBJ_POTIONS:
    case OBJ_STAVES:
        flagset = ISFLAG_KNOW_TYPE;
        break;
    case OBJ_WANDS:
        flagset = (ISFLAG_KNOW_TYPE | ISFLAG_KNOW_PLUSES);
        break;
    case OBJ_JEWELLERY:
        flagset = (ISFLAG_KNOW_CURSE | ISFLAG_KNOW_TYPE);
        if ( ring_has_pluses(item) )
            flagset |= ISFLAG_KNOW_PLUSES;
        break;
    case OBJ_MISSILES:
        flagset = ISFLAG_KNOW_PLUSES | ISFLAG_KNOW_TYPE;
        if (get_ammo_brand(item) == SPMSL_NORMAL)
            flagset &= ~ISFLAG_KNOW_TYPE;
        break;
    case OBJ_WEAPONS:
    case OBJ_ARMOUR:
    default:
        break;
    }
    if ( is_random_artefact(item) ||
         is_fixed_artefact(item) )
    {
        flagset |= ISFLAG_KNOW_PROPERTIES;
    }
    return flagset;
}
bool fully_identified( const item_def& item )
{
    return item_ident(item, full_ident_mask(item));
}

Deletion in crawl-ref/source/itemname.h at line 36 [5.2661173]

B:BD[5.2664352] → [5.2664352:2664559]

B:BD[5.2664744] → [4.709250:709297]

B:BD[4.709297] → [6.815:870]

∅:D[6.870] → [5.2664795:2664796]

∅:D[4.709297] → [5.2664795:2664796]

B:BD[5.2664795] → [5.2664795:2664796]

/* ***********************************************************************
 * bit operations called from a large number of files
 * *********************************************************************** */
bool fully_identified( const item_def &item );
unsigned long full_ident_mask( const item_def& item );

Deletion in crawl-ref/source/itemname.h at line 53 [5.2661173]
∅:D[4.709429] → [5.2667449:2667450]
B:BD[5.2667449] → [5.2667449:2667450]

Insertion in crawl-ref/source/itemname.cc at line 280 [5.2667494]

[3.4596]

        }
    }
}
static const char* weapon_brand_name(const item_def& item, bool terse)
{
    switch (get_weapon_brand(item))
    {
    case SPWPN_NORMAL: return "";
    case SPWPN_FLAMING: return ((terse) ? " (flame)" : " of flaming");
    case SPWPN_FREEZING: return ((terse) ? " (freeze)" : " of freezing");
    case SPWPN_HOLY_WRATH: return ((terse) ? " (holy)" : " of holy wrath");
    case SPWPN_ELECTROCUTION: return ((terse) ? " (elec)":" of electrocution");
    case SPWPN_ORC_SLAYING: return ((terse) ? " (slay orc)":" of orc slaying");
    case SPWPN_VENOM: return ((terse) ? " (venom)" : " of venom");
    case SPWPN_PROTECTION: return ((terse) ? " (protect)" : " of protection");
    case SPWPN_DRAINING: return ((terse) ? " (drain)" : " of draining");
    case SPWPN_SPEED: return ((terse) ? " (speed)" : " of speed");
    case SPWPN_DISRUPTION: return ((terse) ? " (disrupt)" : " of disruption");
    case SPWPN_PAIN: return ((terse) ? " (pain)" : " of pain");
    case SPWPN_DISTORTION: return ((terse) ? " (distort)" : " of distortion");
    case SPWPN_REACHING: return ((terse) ? " (reach)" : " of reaching");
    case SPWPN_VAMPIRICISM:
        return ((terse) ? " (vamp)" : ""); // non-terse already handled
    case SPWPN_VORPAL:
        if (is_range_weapon(item))
            return ((terse) ? " (velocity)" : " of velocity");
        else
        {
            switch (get_vorpal_type(item))
            {
            case DVORP_CRUSHING: return ((terse) ? " (crush)" :" of crushing");
            case DVORP_SLICING:  return ((terse) ? " (slice)" : " of slicing");
            case DVORP_PIERCING: return ((terse) ? " (pierce)":" of piercing");
            case DVORP_CHOPPING: return ((terse) ? " (chop)" : " of chopping");
            case DVORP_SLASHING: return ((terse) ? " (slash)" :" of slashing");
            case DVORP_STABBING: return ((terse) ? " (stab)" : " of stabbing");
            default:             return "";
            }

Insertion in crawl-ref/source/itemname.cc at line 322 [5.2667494]

[3.4606]


    // ranged weapon brands
    case SPWPN_FLAME: return ((terse) ? " (flame)" : " of flame");
    case SPWPN_FROST: return ((terse) ? " (frost)" : " of frost");
    // randart brands
    default: return "";

Insertion in crawl-ref/source/itemname.cc at line 331 [5.2667494]
[3.4614]
[3.4614]
Insertion in crawl-ref/source/itemname.cc at line 921 [5.2667494]
[7.5410]
[3.25974]
```
    bool need_plural = true;
```

Replacement in crawl-ref/source/itemname.cc at line 987 [5.2667494]

B:BD[5.2688802] → [8.14922:14965]

        brand = get_weapon_brand( *this );

[5.2688376]

[5.2688844]

        if (know_type && !terse &&
            (get_weapon_brand(*this) == SPWPN_VAMPIRICISM))
            buff << "vampiric ";

Deletion in crawl-ref/source/itemname.cc at line 991 [5.2667494]
B:BD[5.2688845] → [7.5575:5608]
∅:D[9.1413] → [5.2688905:2688959]
∅:D[7.5608] → [5.2688905:2688959]
∅:D[8.15012] → [5.2688905:2688959]
B:BD[5.2688905] → [5.2688905:2688959]
B:BD[5.2688959] → [3.26646:26683]
∅:D[3.26683] → [5.2689019:2689062]
B:BD[5.2689019] → [5.2689019:2689062]
```
        if (know_type && !terse)
        {
            if (brand == SPWPN_VAMPIRICISM)
                buff << "vampiric ";
        }                       // end if
```

Insertion in crawl-ref/source/itemname.cc at line 992 [5.2667494]

[3.26723]

[5.2689162]

        if ( know_type )
            buff << weapon_brand_name(*this, terse);

Deletion in crawl-ref/source/itemname.cc at line 995 [5.2667494]

B:BD[5.2689163] → [7.5609:5632]

∅:D[9.1451] → [5.2689213:2689350]

∅:D[7.5632] → [5.2689213:2689350]

∅:D[8.15121] → [5.2689213:2689350]

B:BD[5.2689213] → [5.2689213:2689350]

B:BD[5.2689350] → [3.26724:26788]

∅:D[3.26788] → [5.2689435:2689491]

B:BD[5.2689435] → [5.2689435:2689491]

B:BD[5.2689491] → [3.26789:26855]

∅:D[3.26855] → [5.2689578:2689636]

B:BD[5.2689578] → [5.2689578:2689636]

B:BD[5.2689636] → [3.26856:26922]

∅:D[3.26922] → [5.2689723:2689784]

B:BD[5.2689723] → [5.2689723:2689784]

B:BD[5.2689784] → [3.26923:26992]

∅:D[3.26992] → [5.2689874:2689933]

B:BD[5.2689874] → [5.2689874:2689933]

B:BD[5.2689933] → [3.26993:27064]

∅:D[3.27064] → [5.2690025:2690078]

B:BD[5.2690025] → [5.2690025:2690078]

B:BD[5.2690078] → [3.27065:27127]

∅:D[3.27127] → [5.2690161:2690219]

B:BD[5.2690161] → [5.2690161:2690219]

B:BD[5.2690219] → [3.27128:27197]

∅:D[3.27197] → [5.2690309:2690365]

B:BD[5.2690309] → [5.2690309:2690365]

B:BD[5.2690365] → [3.27198:27263]

∅:D[3.27263] → [5.2690451:2690504]

B:BD[5.2690451] → [5.2690451:2690504]

B:BD[5.2690504] → [3.27264:27326]

∅:D[3.27326] → [5.2690587:2690641]

B:BD[5.2690587] → [5.2690587:2690641]

B:BD[5.2690641] → [8.15122:15168]

∅:D[8.15168] → [4.711227:711245]

B:BD[4.711227] → [4.711227:711245]

B:BD[4.711245] → [3.27327:27399]

∅:D[3.27399] → [4.711367:711413]

B:BD[4.711367] → [4.711367:711413]

B:BD[4.711413] → [8.15169:15217]

∅:D[8.15217] → [5.2690699:2690754]

∅:D[4.711460] → [5.2690699:2690754]

B:BD[5.2690699] → [5.2690699:2690754]

B:BD[5.2690754] → [3.27400:27469]

∅:D[3.27469] → [5.2690844:2690907]

B:BD[5.2690844] → [5.2690844:2690907]

B:BD[5.2690907] → [3.27470:27538]

∅:D[3.27538] → [5.2690996:2691060]

B:BD[5.2690996] → [5.2690996:2691060]

B:BD[5.2691060] → [3.27539:27609]

∅:D[3.27609] → [5.2691151:2691215]

B:BD[5.2691151] → [5.2691151:2691215]

B:BD[5.2691215] → [3.27610:27678]

∅:D[3.27678] → [5.2691304:2691331]

B:BD[5.2691304] → [5.2691304:2691331]

B:BD[5.2691331] → [4.711461:711498]

B:BD[4.711498] → [3.27679:27748]

∅:D[3.27748] → [4.711588:711652]

B:BD[4.711588] → [4.711588:711652]

B:BD[4.711652] → [3.27749:27817]

∅:D[3.27817] → [4.711741:711768]

B:BD[4.711741] → [4.711741:711768]

∅:D[4.711768] → [5.2691331:2691403]

B:BD[5.2691331] → [5.2691331:2691403]

B:BD[5.2691403] → [3.27818:27880]

∅:D[3.27880] → [5.2691486:2691563]

B:BD[5.2691486] → [5.2691486:2691563]

B:BD[5.2691563] → [3.27881:27943]

∅:D[3.27943] → [5.2691646:2691729]

B:BD[5.2691646] → [5.2691646:2691729]

B:BD[5.2691729] → [3.27944:28050]

∅:D[3.28050] → [5.2691819:2691878]

B:BD[5.2691819] → [5.2691819:2691878]

B:BD[5.2691878] → [3.28051:28120]

∅:D[3.28120] → [5.2691968:2692020]

B:BD[5.2691968] → [5.2691968:2692020]

B:BD[5.2692020] → [3.28121:28181]

∅:D[3.28181] → [5.2692101:2692159]

B:BD[5.2692101] → [5.2692101:2692159]

B:BD[5.2692159] → [3.28182:28251]

∅:D[3.28251] → [5.2692249:2692306]

B:BD[5.2692249] → [5.2692249:2692306]

B:BD[5.2692306] → [3.28252:28317]

∅:D[3.28317] → [5.2692392:2692416]

B:BD[5.2692392] → [5.2692392:2692416]

B:BD[5.2692416] → [3.28318:28401]

∅:D[3.28401] → [5.2692459:2692484]

B:BD[5.2692459] → [5.2692459:2692484]

        if (know_type)
        {
            switch (brand)
            {
            case SPWPN_NORMAL:
                break;
            case SPWPN_FLAMING:
                buff << ((terse) ? " (flame)" : " of flaming");
                break;
            case SPWPN_FREEZING:
                buff << ((terse) ? " (freeze)" : " of freezing");
                break;
            case SPWPN_HOLY_WRATH:
                buff << ((terse) ? " (holy)" : " of holy wrath");
                break;
            case SPWPN_ELECTROCUTION:
                buff << ((terse) ? " (elec)" : " of electrocution");
                break;
            case SPWPN_ORC_SLAYING:
                buff << ((terse) ? " (slay orc)" : " of orc slaying");
                break;
            case SPWPN_VENOM:
                buff << ((terse) ? " (venom)" : " of venom");
                break;
            case SPWPN_PROTECTION:
                buff << ((terse) ? " (protect)" : " of protection");
                break;
            case SPWPN_DRAINING:
                buff << ((terse) ? " (drain)" : " of draining");
                break;
            case SPWPN_SPEED:
                buff << ((terse) ? " (speed)" : " of speed");
                break;
            case SPWPN_VORPAL:
                if (is_range_weapon( *this ))
                {
                    buff << ((terse) ? " (velocity)" : " of velocity");
                    break;
                }
                switch (get_vorpal_type(*this))
                {
                case DVORP_CRUSHING:
                    buff << ((terse) ? " (crush)" : " of crushing");
                    break;
                case DVORP_SLICING:
                    buff << ((terse) ? " (slice)" : " of slicing");
                    break;
                case DVORP_PIERCING:
                    buff << ((terse) ? " (pierce)" : " of piercing");
                    break;
                case DVORP_CHOPPING:
                    buff << ((terse) ? " (chop)" : " of chopping");
                    break;
                case DVORP_SLASHING:
                    buff << ((terse) ? " (slash)" : " of slashing");
                    break;
                case DVORP_STABBING:
                    buff << ((terse) ? " (stab)" : " of stabbing");
                    break;
                }
                break;
            case SPWPN_FLAME:
                buff << ((terse) ? " (flame)" : " of flame");
                break;          // bows/xbows
            case SPWPN_FROST:
                buff << ((terse) ? " (frost)" : " of frost");
                break;          // bows/xbows
            case SPWPN_VAMPIRICISM:
                if (terse)      // non-terse already handled above
                    buff << " (vamp)";
                break;
            case SPWPN_DISRUPTION:
                buff << ((terse) ? " (disrupt)" : " of disruption");
                break;
            case SPWPN_PAIN:
                buff << ((terse) ? " (pain)" : " of pain");
                break;
            case SPWPN_DISTORTION:
                buff << ((terse) ? " (distort)" : " of distortion");
                break;
            case SPWPN_REACHING:
                buff << ((terse) ? " (reach)" : " of reaching");
                break;
            /* 25 - 29 are randarts */
            default:
                break;
            }
        }

Insertion in crawl-ref/source/itemname.cc at line 1000 [5.2667494]
[5.2692658]
[3.28435]
```
        need_plural = false;
```
Insertion in crawl-ref/source/itemname.cc at line 1142 [5.2667494]
[5.2704455]
[7.6030]
```
        need_plural = false;
```

Replacement in crawl-ref/source/itemname.cc at line 1189 [5.2667494]

B:BD[5.2708480] → [5.2708480:2708511]

B:BD[5.2708511] → [3.31059:31094]

∅:D[3.31094] → [5.2708569:2708620]

B:BD[5.2708569] → [5.2708569:2708620]

B:BD[5.2708620] → [3.31095:31131]

∅:D[3.31131] → [5.2708679:2708722]

B:BD[5.2708679] → [5.2708679:2708722]

B:BD[5.2708722] → [3.31132:31160]

∅:D[3.31160] → [5.2708773:2708849]

B:BD[5.2708773] → [5.2708773:2708849]

B:BD[5.2708849] → [3.31161:31190]

∅:D[3.31190] → [5.2708901:2708945]

B:BD[5.2708901] → [5.2708901:2708945]

B:BD[5.2708945] → [3.31191:31220]

∅:D[3.31220] → [5.2708997:2709045]

B:BD[5.2708997] → [5.2708997:2709045]

B:BD[5.2709045] → [3.31221:31254]

∅:D[3.31254] → [5.2709101:2709151]

B:BD[5.2709101] → [5.2709101:2709151]

B:BD[5.2709151] → [3.31255:31289]

∅:D[3.31289] → [5.2709208:2709258]

B:BD[5.2709208] → [5.2709208:2709258]

B:BD[5.2709258] → [3.31290:31325]

∅:D[3.31325] → [5.2709316:2709360]

B:BD[5.2709316] → [5.2709316:2709360]

B:BD[5.2709360] → [3.31326:31364]

∅:D[3.31364] → [5.2709421:2709467]

B:BD[5.2709421] → [5.2709421:2709467]

B:BD[5.2709467] → [3.31365:31396]

∅:D[3.31396] → [5.2709521:2709566]

B:BD[5.2709521] → [5.2709521:2709566]

B:BD[5.2709566] → [3.31397:31427]

∅:D[3.31427] → [5.2709619:2709664]

B:BD[5.2709619] → [5.2709619:2709664]

B:BD[5.2709664] → [3.31428:31458]

∅:D[3.31458] → [5.2709717:2709766]

B:BD[5.2709717] → [5.2709717:2709766]

B:BD[5.2709766] → [3.31459:31492]

∅:D[3.31492] → [5.2709822:2709869]

B:BD[5.2709822] → [5.2709822:2709869]

B:BD[5.2709869] → [3.31493:31525]

∅:D[3.31525] → [5.2709924:2709968]

B:BD[5.2709924] → [5.2709924:2709968]

B:BD[5.2709968] → [3.31526:31555]

∅:D[3.31555] → [5.2710020:2710064]

B:BD[5.2710020] → [5.2710020:2710064]

B:BD[5.2710064] → [3.31556:31585]

∅:D[3.31585] → [5.2710116:2710162]

B:BD[5.2710116] → [5.2710116:2710162]

B:BD[5.2710162] → [3.31586:31617]

∅:D[3.31617] → [5.2710216:2710261]

B:BD[5.2710216] → [5.2710216:2710261]

B:BD[5.2710261] → [3.31618:31648]

∅:D[3.31648] → [5.2710314:2710363]

B:BD[5.2710314] → [5.2710314:2710363]

B:BD[5.2710363] → [3.31649:31682]

∅:D[3.31682] → [5.2710419:2710464]

B:BD[5.2710419] → [5.2710419:2710464]

B:BD[5.2710464] → [3.31683:31713]

∅:D[3.31713] → [5.2710517:2710563]

B:BD[5.2710517] → [5.2710517:2710563]

B:BD[5.2710563] → [3.31714:31745]

∅:D[3.31745] → [5.2710617:2710636]

B:BD[5.2710617] → [5.2710617:2710636]

        case FOOD_MEAT_RATION:
            buff << "meat ration";
            break;
        case FOOD_BREAD_RATION:
            buff << "bread ration";
            break;
        case FOOD_PEAR:
            buff << "pear";
            break;
        case FOOD_APPLE:        // make this less common
            buff << "apple";
            break;
        case FOOD_CHOKO:
            buff << "choko";
            break;
        case FOOD_HONEYCOMB:
            buff << "honeycomb";
            break;
        case FOOD_ROYAL_JELLY:
            buff << "royal jell";
            break;
        case FOOD_SNOZZCUMBER:
            buff << "snozzcumber";
            break;
        case FOOD_PIZZA:
            buff << "slice of pizza";
            break;
        case FOOD_APRICOT:
            buff << "apricot";
            break;
        case FOOD_ORANGE:
            buff << "orange";
            break;
        case FOOD_BANANA:
            buff << "banana";
            break;
        case FOOD_STRAWBERRY:
            buff << "strawberr";
            break;
        case FOOD_RAMBUTAN:
            buff << "rambutan";
            break;
        case FOOD_LEMON:
            buff << "lemon";
            break;
        case FOOD_GRAPE:
            buff << "grape";
            break;
        case FOOD_SULTANA:
            buff << "sultana";
            break;
        case FOOD_LYCHEE:
            buff << "lychee";
            break;
        case FOOD_BEEF_JERKY:
            buff << "beef jerk";
            break;
        case FOOD_CHEESE:
            buff << "cheese";
            break;
        case FOOD_SAUSAGE:
            buff << "sausage";
            break;

[5.2708480]

[5.2710636]

        case FOOD_MEAT_RATION: buff << "meat ration"; break;
        case FOOD_BREAD_RATION: buff << "bread ration"; break;
        case FOOD_PEAR: buff << "pear"; break;
        case FOOD_APPLE: buff << "apple"; break;
        case FOOD_CHOKO: buff << "choko"; break;
        case FOOD_HONEYCOMB: buff << "honeycomb"; break;
        case FOOD_ROYAL_JELLY: buff << "royal jell"; break;
        case FOOD_SNOZZCUMBER: buff << "snozzcumber"; break;
        case FOOD_PIZZA: buff << "slice of pizza"; break;
        case FOOD_APRICOT: buff << "apricot"; break;
        case FOOD_ORANGE: buff << "orange"; break;
        case FOOD_BANANA: buff << "banana"; break;
        case FOOD_STRAWBERRY: buff << "strawberr"; break;
        case FOOD_RAMBUTAN: buff << "rambutan"; break;
        case FOOD_LEMON: buff << "lemon"; break;
        case FOOD_GRAPE: buff << "grape"; break;
        case FOOD_SULTANA: buff << "sultana"; break;
        case FOOD_LYCHEE: buff << "lychee"; break;
        case FOOD_BEEF_JERKY: buff << "beef jerk"; break;
        case FOOD_CHEESE: buff << "cheese"; break;
        case FOOD_SAUSAGE: buff << "sausage"; break;

Insertion in crawl-ref/source/itemname.cc at line 1212 [5.2667494]
[3.31756]
[8.16846]
```
            need_plural = false;
```
Deletion in crawl-ref/source/itemname.cc at line 1235 [5.2667494]
B:BD[3.32114] → [3.32114:32159]
```
        // 's' gets added later if necessary
```
Insertion in crawl-ref/source/itemname.cc at line 1238 [5.2667494]
[5.2711403]
[3.32160]
```
        need_plural = false;
```
Insertion in crawl-ref/source/itemname.cc at line 1318 [5.2667494]
[5.2727066]
[3.33495]
```
        need_plural = false;
```

Replacement in crawl-ref/source/itemname.cc at line 1466 [5.2667494]

B:BD[5.2745165] → [5.2745165:2745186]

B:BD[5.2745186] → [8.21296:21563]

∅:D[8.21563] → [5.2745417:2745423]

B:BD[5.2745417] → [5.2745417:2745423]

    // hackish {dlb}
    if (this->quantity > 1
        && this->base_type != OBJ_MISSILES
        && this->base_type != OBJ_SCROLLS
        && this->base_type != OBJ_POTIONS
        && this->base_type != OBJ_MISCELLANY
        && (this->base_type != OBJ_FOOD || item_typ != FOOD_CHUNK))
    {

[5.2745165]

[3.35841]

    if (need_plural && this->quantity > 1)

Replacement in crawl-ref/source/itemname.cc at line 1468 [5.2667494]
∅:D[3.35862] → [5.2745467:2745473]
B:BD[5.2745467] → [5.2745467:2745473]
```
    }
```
[3.35862]
[3.35863]

Deletion in crawl-ref/source/itemname.cc at line 1894 [5.2667494]

∅:D[4.727288] → [5.2777207:2777208]

B:BD[5.2777207] → [5.2777207:2777208]

B:BD[5.2777208] → [6.872:1176]

∅:D[6.1176] → [4.727407:727515]

B:BD[4.727407] → [4.727407:727515]

B:BD[4.727515] → [6.1177:1198]

∅:D[6.1198] → [4.727515:727551]

B:BD[4.727515] → [4.727515:727551]

B:BD[4.727606] → [4.727606:727877]

B:BD[4.727877] → [6.1199:1294]

B:BD[6.1294] → [2.134:226]

∅:D[2.226] → [4.727877:727892]

∅:D[6.1294] → [4.727877:727892]

B:BD[4.727877] → [4.727877:727892]

B:BD[4.727892] → [6.1295:1338]

∅:D[6.1338] → [4.727892:727963]

B:BD[4.727892] → [4.727892:727963]

B:BD[4.727963] → [2.227:268]

∅:D[2.268] → [4.728037:728080]

B:BD[4.728037] → [4.728037:728080]

B:BD[4.728080] → [2.269:275]

∅:D[2.275] → [6.1339:1462]

B:BD[4.728080] → [6.1339:1462]

∅:D[6.1462] → [4.728125:728127]

B:BD[4.728125] → [4.728125:728127]


// Returns the mask of interesting identify bits for this item
// (e.g., scrolls don't have know-cursedness.)
unsigned long full_ident_mask( const item_def& item )
{
    unsigned long flagset = ISFLAG_IDENT_MASK;
    switch ( item.base_type )
    {
    case OBJ_FOOD:
        flagset = 0;
        break;
    case OBJ_BOOKS:
    case OBJ_MISCELLANY:
    case OBJ_ORBS:
    case OBJ_SCROLLS:
    case OBJ_POTIONS:
    case OBJ_STAVES:
        flagset = ISFLAG_KNOW_TYPE;
        break;
    case OBJ_WANDS:
        flagset = (ISFLAG_KNOW_TYPE | ISFLAG_KNOW_PLUSES);
        break;
    case OBJ_JEWELLERY:
        flagset = (ISFLAG_KNOW_CURSE | ISFLAG_KNOW_TYPE);
        if ( ring_has_pluses(item) )
            flagset |= ISFLAG_KNOW_PLUSES;
        break;
    case OBJ_MISSILES:
        flagset = ISFLAG_KNOW_PLUSES | ISFLAG_KNOW_TYPE;
        if (get_ammo_brand(item) == SPMSL_NORMAL)
            flagset &= ~ISFLAG_KNOW_TYPE;
        break;
    case OBJ_WEAPONS:
    case OBJ_ARMOUR:
    default:
        break;
    }
    if ( is_random_artefact(item) ||
         is_fixed_artefact(item) )
    {
        flagset |= ISFLAG_KNOW_PROPERTIES;
    }
    return flagset;
}
bool fully_identified( const item_def& item )
{
    return item_ident(item, full_ident_mask(item));
}

Replacement in crawl-ref/source/invent.cc at line 31 [5.2920632]
∅:D[10.370217] → [5.2921239:2921261]
B:BD[5.2921239] → [5.2921239:2921261]
```
#include "itemname.h"
```
[10.370217]
[5.2921261]
```
#include "itemprop.h"
```

More minor cleanups.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/itemprop.h at line 30 [4.641567]

Insertion in crawl-ref/source/itemprop.cc at line 477 [4.646661]

Deletion in crawl-ref/source/itemname.h at line 36 [5.2661173]

Deletion in crawl-ref/source/itemname.h at line 53 [5.2661173]

Insertion in crawl-ref/source/itemname.cc at line 280 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 322 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 331 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 921 [5.2667494]

Replacement in crawl-ref/source/itemname.cc at line 987 [5.2667494]

Deletion in crawl-ref/source/itemname.cc at line 991 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 992 [5.2667494]

Deletion in crawl-ref/source/itemname.cc at line 995 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1000 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1142 [5.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1189 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1212 [5.2667494]

Deletion in crawl-ref/source/itemname.cc at line 1235 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1238 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1318 [5.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1466 [5.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1468 [5.2667494]

Deletion in crawl-ref/source/itemname.cc at line 1894 [5.2667494]

Replacement in crawl-ref/source/invent.cc at line 31 [5.2920632]