fiddlerwoaroof/crawl - Change KAL42YT6OQXFPMKKKHE2NQM47W5KMLSRI6KWFRTJFAO4WKP4MMLAC

More naming fixes. We should integrate helmets somehow.

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

Created by haranp on April 13, 2007

KAL42YT6OQXFPMKKKHE2NQM47W5KMLSRI6KWFRTJFAO4WKP4MMLAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills2.cc at line 2340 [3.647133]
B:BD[3.742742] → [2.138:179]
```
    strcat(wepstr, item_base_name(wep));
```
[3.742742]
[3.742813]
```
    strcat(wepstr, item_base_name(wep).c_str());
```
Deletion in crawl-ref/source/randart.h at line 79 [3.889057]
B:BD[3.892138] → [3.892138:892139]
Deletion in crawl-ref/source/randart.h at line 84 [3.889057]
∅:D[2.310] → [3.892376:892377]
B:BD[3.892376] → [3.892376:892377]

Deletion in crawl-ref/source/randart.h at line 86 [3.889057]

B:BD[3.892453] → [3.892453:892635]

B:BD[3.892636] → [3.892636:892711]

 * called from: itemname
 * *********************************************************************** */
void standard_name_armour( const item_def &item, char glorg[ITEMNAME_SIZE] );
/* ***********************************************************************

Replacement in crawl-ref/source/randart.cc at line 1268 [3.893152]
B:BD[3.924927] → [2.4202:4247]
```
        strcat(art_n, item_base_name(item));
```
[3.924927]
[4.196630]
```
        strcat(art_n, item_base_name(item).c_str());
```
Replacement in crawl-ref/source/randart.cc at line 1275 [3.893152]
B:BD[3.925164] → [2.4269:4314]
```
        strcat(art_n, item_base_name(item));
```
[3.925164]
[2.4314]
```
        strcat(art_n, item_base_name(item).c_str());
```
Replacement in crawl-ref/source/randart.cc at line 1283 [3.893152]
B:BD[5.197250] → [2.4403:4448]
```
        strcat(art_n, item_base_name(item));
```
[5.197250]
[3.925506]
```
        strcat(art_n, item_base_name(item).c_str());
```

Replacement in crawl-ref/source/randart.cc at line 1347 [3.893152]

B:BD[3.927693] → [3.927693:927802]

        char st_p3[ITEMNAME_SIZE];
        standard_name_armour(item, st_p3);
        strcat(art_n, st_p3);

[3.927693]

[4.196728]

        strcat(art_n, item_base_name(item).c_str());

Deletion in crawl-ref/source/randart.cc at line 1352 [3.893152]
B:BD[3.927859] → [3.927859:927890]
```
    char st_p[ITEMNAME_SIZE];
```

Replacement in crawl-ref/source/randart.cc at line 1354 [3.893152]

B:BD[3.927921] → [3.927921:927992]

        standard_name_armour(item, st_p);
        strcat(art_n, st_p);

[3.927921]

[2.4738]

        strcat(art_n, item_base_name(item).c_str());

Replacement in crawl-ref/source/randart.cc at line 1359 [3.893152]
B:BD[3.928068] → [3.928068:928103]
```
        char st_p2[ITEMNAME_SIZE];
```
[3.928068]
[3.928103]
```
        char st_p[ITEMNAME_SIZE];
```
Replacement in crawl-ref/source/randart.cc at line 1362 [3.893152]
∅:D[5.197345] → [3.928174:928247]
B:BD[3.928174] → [3.928174:928247]
```
        standard_name_armour(item, st_p2);
        strcat(art_n, st_p2);
```
[5.197345]
[2.4794]
```
        strcat(art_n, item_base_name(item).c_str());
```

Deletion in crawl-ref/source/randart.cc at line 1725 [3.893152]

B:BD[3.938452] → [3.938452:938453]

B:BD[3.941621] → [3.941621:941723]

B:BD[3.941723] → [5.197769:197787]

∅:D[5.197787] → [3.941744:942559]

B:BD[3.941744] → [3.941744:942559]

B:BD[3.942559] → [5.197788:197898]

∅:D[5.197898] → [3.942669:943823]

B:BD[3.942669] → [3.942669:943823]

B:BD[3.943823] → [5.197899:198069]

∅:D[5.198069] → [3.943823:943843]

B:BD[3.943823] → [3.943823:943843]

B:BD[3.943843] → [5.198070:198102]

∅:D[5.198102] → [3.944081:945956]

B:BD[3.944081] → [3.944081:945956]


void standard_name_armour( const item_def &item, char glorg[ITEMNAME_SIZE] )
{
    short helm_type; 
    glorg[0] = 0;
    switch (item.sub_type)
    {
    case ARM_ROBE:
        strcat(glorg, "robe");
        break;
    case ARM_LEATHER_ARMOUR:
        strcat(glorg, "leather armour");
        break;
    case ARM_RING_MAIL:
        strcat(glorg, "ring mail");
        break;
    case ARM_SCALE_MAIL:
        strcat(glorg, "scale mail");
        break;
    case ARM_CHAIN_MAIL:
        strcat(glorg, "chain mail");
        break;
    case ARM_SPLINT_MAIL:
        strcat(glorg, "splint mail");
        break;
    case ARM_BANDED_MAIL:
        strcat(glorg, "banded mail");
        break;
    case ARM_PLATE_MAIL:
        strcat(glorg, "plate mail");
        break;
    case ARM_SHIELD:
        strcat(glorg, "shield");
        break;
    case ARM_CLOAK:
        strcat(glorg, "cloak");
        break;
    case ARM_HELMET:
        if (get_helmet_type(item) == THELM_HELM
                    || get_helmet_type(item) == THELM_HELMET)
        {   
            short dhelm = get_helmet_desc( item );
            if (dhelm != THELM_DESC_PLAIN)
            {   
                strcat( glorg,
                        (dhelm == THELM_DESC_WINGED)   ? "winged " :
                        (dhelm == THELM_DESC_HORNED)   ? "horned " :
                        (dhelm == THELM_DESC_CRESTED)  ? "crested " :
                        (dhelm == THELM_DESC_PLUMED)   ? "plumed " :
                        (dhelm == THELM_DESC_SPIKED)   ? "spiked " :
                        (dhelm == THELM_DESC_VISORED)  ? "visored " :
                        (dhelm == THELM_DESC_JEWELLED) ? "jeweled "
                                                       : "buggy " );
            }
        }
        helm_type = get_helmet_type( item );
        if (helm_type == THELM_HELM)
            strcat(glorg, "helm");
        else if (helm_type == THELM_CAP)
            strcat(glorg, "cap");
        else if (helm_type == THELM_WIZARD_HAT)
            strcat(glorg, "wizard's hat");
        else 
            strcat(glorg, "helmet");
        break;
    case ARM_GLOVES:
        strcat(glorg, "gloves");
        break;
    case ARM_NAGA_BARDING:
        strcat(glorg, "naga barding");
        break;
    case ARM_CENTAUR_BARDING:
        strcat(glorg, "centaur barding");
        break;
    case ARM_BOOTS:
        strcat(glorg, "boots");
        break;
    case ARM_BUCKLER:
        strcat(glorg, "buckler");
        break;
    case ARM_LARGE_SHIELD:
        strcat(glorg, "large shield");
        break;
    case ARM_DRAGON_HIDE:
        strcat(glorg, "dragon hide");
        break;
    case ARM_TROLL_HIDE:
        strcat(glorg, "troll hide");
        break;
    case ARM_CRYSTAL_PLATE_MAIL:
        strcat(glorg, "crystal plate mail");
        break;
    case ARM_DRAGON_ARMOUR:
        strcat(glorg, "dragon armour");
        break;
    case ARM_TROLL_LEATHER_ARMOUR:
        strcat(glorg, "troll leather armour");
        break;
    case ARM_ICE_DRAGON_HIDE:
        strcat(glorg, "ice dragon hide");
        break;
    case ARM_ICE_DRAGON_ARMOUR:
        strcat(glorg, "ice dragon armour");
        break;
    case ARM_STEAM_DRAGON_HIDE:
        strcat(glorg, "steam dragon hide");
        break;
    case ARM_STEAM_DRAGON_ARMOUR:
        strcat(glorg, "steam dragon armour");
        break;
    case ARM_MOTTLED_DRAGON_HIDE:
        strcat(glorg, "mottled dragon hide");
        break;
    case ARM_MOTTLED_DRAGON_ARMOUR:
        strcat(glorg, "mottled dragon armour");
        break;
    case ARM_STORM_DRAGON_HIDE:
        strcat(glorg, "storm dragon hide");
        break;
    case ARM_STORM_DRAGON_ARMOUR:
        strcat(glorg, "storm dragon armour");
        break;
    case ARM_GOLD_DRAGON_HIDE:
        strcat(glorg, "gold dragon hide");
        break;
    case ARM_GOLD_DRAGON_ARMOUR:
        strcat(glorg, "gold dragon armour");
        break;
    case ARM_ANIMAL_SKIN:
        strcat(glorg, "animal skin");
        break;
    case ARM_SWAMP_DRAGON_HIDE:
        strcat(glorg, "swamp dragon hide");
        break;
    case ARM_SWAMP_DRAGON_ARMOUR:
        strcat(glorg, "swamp dragon armour");
        break;
    }
}                               // end standard_name_armour()

Replacement in crawl-ref/source/newgame.cc at line 1546 [3.1132300]

B:BD[2.5245] → [2.5245:5307]

                    item_base_name(OBJ_WEAPONS, startwep[i]),

[2.5245]

[5.385919]

                    weapon_base_name(startwep[i]),

Replacement in crawl-ref/source/newgame.cc at line 1561 [3.1132300]

B:BD[2.5375] → [2.5375:5446]

                    item_base_name(OBJ_WEAPONS, Options.prev_weapon));

[2.5375]

[4.217757]

                    weapon_base_name(Options.prev_weapon));

Replacement in crawl-ref/source/itemprop.h at line 149 [5.641567]

B:BD[2.5558] → [2.5558:5687]

const char* item_base_name(const item_def &item);
const char* item_base_name(object_class_type basetype, unsigned char subtype);

[2.5558]

[5.646616]

std::string item_base_name(const item_def &item);
const char* weapon_base_name(unsigned char subtype);

Replacement in crawl-ref/source/itemprop.cc at line 2089 [5.646661]
B:BD[2.5692] → [2.5692:5741]
```
const char* item_base_name(const item_def &item)
```
[2.5692]
[2.5741]
```
std::string item_base_name(const item_def &item)
```

Replacement in crawl-ref/source/itemprop.cc at line 2091 [5.646661]

B:BD[2.5743] → [2.5743:5859]

∅:D[2.5859] → [5.708792:708794]

B:BD[5.708792] → [5.708792:708794]

B:BD[5.708794] → [2.5860:5963]

    return item_base_name(static_cast<object_class_type>(item.base_type),
                          item.sub_type);
}
const char* item_base_name(object_class_type basetype, unsigned char subtype)
{
    switch (basetype)

[2.5743]

[2.5963]

    switch ( item.base_type )

Replacement in crawl-ref/source/itemprop.cc at line 2094 [5.646661]

B:BD[2.5991] → [2.5991:6047]

        return Weapon_prop[Weapon_index[subtype]].name;

[2.5991]

[2.6047]

        return Weapon_prop[Weapon_index[item.sub_type]].name;
    case OBJ_MISSILES:
        return Missile_prop[Missile_index[item.sub_type]].name;

Replacement in crawl-ref/source/itemprop.cc at line 2098 [5.646661]

B:BD[2.6068] → [2.6068:6205]

        return Armour_prop[Armour_index[subtype]].name;
    case OBJ_MISSILES:
        return Missile_prop[Missile_index[subtype]].name;

[2.6068]

[2.6205]

        if ( item.sub_type != ARM_HELMET )
        {
            return Armour_prop[Armour_index[item.sub_type]].name;
        }
        else
        {
            std::string result;
            if (get_helmet_type(item) == THELM_HELM ||
                get_helmet_type(item) == THELM_HELMET) 
            {
                const short dhelm = get_helmet_desc( item );
                
                result +=
                    (dhelm == THELM_DESC_PLAIN)    ? "" :
                    (dhelm == THELM_DESC_WINGED)   ? "winged " :
                    (dhelm == THELM_DESC_HORNED)   ? "horned " :
                    (dhelm == THELM_DESC_CRESTED)  ? "crested " :
                    (dhelm == THELM_DESC_PLUMED)   ? "plumed " :
                    (dhelm == THELM_DESC_SPIKED)   ? "spiked " :
                    (dhelm == THELM_DESC_VISORED)  ? "visored " :
                    (dhelm == THELM_DESC_JEWELLED) ? "jeweled "
                                                   : "buggy ";
            }
            
            const short helm_type = get_helmet_type( item );
            if (helm_type == THELM_HELM)
                result += "helm";
            else if (helm_type == THELM_CAP)
                result += "cap";
            else if (helm_type == THELM_WIZARD_HAT)
                result += "wizard's hat";
            else 
                result += "helmet";
            
            return result;
        }

Insertion in crawl-ref/source/itemprop.cc at line 2138 [5.646661]

[2.6245]


const char* weapon_base_name(unsigned char subtype)
{
    return Weapon_prop[Weapon_index[subtype]].name;
}

Replacement in crawl-ref/source/itemname.cc at line 484 [3.2667494]

B:BD[3.2689062] → [2.6248:6308]

        strncat(buff, item_base_name(item), ITEMNAME_SIZE);

[3.2689062]

[3.2689162]

        strncat(buff, item_base_name(item).c_str(), ITEMNAME_SIZE);

Replacement in crawl-ref/source/itemname.cc at line 721 [3.2667494]

B:BD[3.2697213] → [3.2697213:2697329]

        standard_name_armour( item, tmp_buff );  // in randart.cc
        strncat( buff, tmp_buff, ITEMNAME_SIZE );

[3.2697213]

[3.2697329]

        strncat( buff, item_base_name(item).c_str(), ITEMNAME_SIZE );

More naming fixes. We should integrate helmets somehow.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/skills2.cc at line 2340 [3.647133]

Deletion in crawl-ref/source/randart.h at line 79 [3.889057]

Deletion in crawl-ref/source/randart.h at line 84 [3.889057]

Deletion in crawl-ref/source/randart.h at line 86 [3.889057]

Replacement in crawl-ref/source/randart.cc at line 1268 [3.893152]

Replacement in crawl-ref/source/randart.cc at line 1275 [3.893152]

Replacement in crawl-ref/source/randart.cc at line 1283 [3.893152]