fiddlerwoaroof/crawl - Change 2KTJHQUX2LTU2BCLS5YXVRRKMOYKKIZAPF2LBKORFGSHEN5IO3IAC

Cleaned up shop-handling code considerably.

Instead of shops passing around global id_arr arrays, shops use the newly added third argument to item_def::name() which indicates whether to override item ID status. This means that the shop ID SIGHUP protection is now unnecessary; it's been removed. Hopefully I caught all the places where the stash tracker tries to get item names and fixed them, but I might have missed something.

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

Created by haranp on April 24, 2007

2KTJHQUX2LTU2BCLS5YXVRRKMOYKKIZAPF2LBKORFGSHEN5IO3IAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tags.cc at line 870 [10.164589]
[10.185319]
[10.185319]
```
    const id_arr& identy(get_typeid_array());
```
Replacement in crawl-ref/source/tags.cc at line 872 [10.164589]
B:BD[10.185342] → [10.185342:185367]
```
    marshallByte(th, 4);
```
[10.185342]
[10.185367]
```
    marshallByte(th, static_cast<char>(identy.width()));
```
Replacement in crawl-ref/source/tags.cc at line 874 [10.164589]
B:BD[10.185393] → [10.185393:185419]
```
    marshallByte(th, 50);
```
[10.185393]
[10.185419]
```
    marshallByte(th, static_cast<char>(identy.height()));
```

Replacement in crawl-ref/source/tags.cc at line 876 [10.164589]

B:BD[10.185420] → [10.185420:185485]

B:BD[10.185485] → [11.100285:100341]

B:BD[11.100341] → [12.18:37]

    // this is really dumb. We copy the id[] array from itemname
    // to the stack, for no good reason that I can see.
    id_arr identy;

[10.185420]

[10.185566]

    for (i = 0; i < identy.width(); ++i)
        for (j = 0; j < identy.height(); ++j)
            marshallByte(th, static_cast<char>(identy[i][j]));

Deletion in crawl-ref/source/tags.cc at line 880 [10.164589]

B:BD[10.185567] → [12.38:65]

∅:D[12.65] → [10.185588:185707]

B:BD[10.185588] → [10.185588:185707]

    save_id(identy, true);
    for (i = 0; i < 4; ++i)
    {
        for (j = 0; j < 50; ++j)
            marshallByte(th, identy[i][j]);
    }

Replacement in crawl-ref/source/tags.cc at line 1194 [10.164589]

B:BD[10.201621] → [10.201621:201679]

            char ch;
            ch = unmarshallByte(th);

[10.201621]

[10.201679]

            const item_type_id_state_type ch =
                static_cast<item_type_id_state_type>(unmarshallByte(th));

Replacement in crawl-ref/source/stash.h at line 143 [13.138156]
B:BD[13.141829] → [13.141829:141857]
```
        item_def      item;
```
[13.141829]
[13.141857]
```
        item_def item;
```

Deletion in crawl-ref/source/stash.h at line 151 [13.138156]

B:BD[13.142097] → [13.142097:142098]

B:BD[13.142098] → [6.21:74]

∅:D[6.74] → [13.142117:142240]

B:BD[13.142117] → [13.142117:142240]


    class ShopId : public shopping_hup_protect
    {
    public:
        ShopId(int stype);
        ~ShopId();
    private:
        int shoptype;
        id_fix_arr id;
    };

Deletion in crawl-ref/source/stash.cc at line 636 [13.147324]
B:BD[13.163123] → [13.163123:163126]
B:BD[13.163126] → [6.76:164]
∅:D[6.164] → [13.163186:163227]
B:BD[13.163186] → [13.163186:163227]
```
}
ShopInfo::ShopId::ShopId(int stype)
    : shopping_hup_protect(), shoptype(stype), id()
{
    shop_init_id_type( shoptype, id );
```
Deletion in crawl-ref/source/stash.cc at line 638 [13.147324]
B:BD[13.163230] → [13.163230:163304]
```
ShopInfo::ShopId::~ShopId()
{
    shop_uninit_id_type( shoptype, id );
}
```

Replacement in crawl-ref/source/stash.cc at line 649 [13.147324]

B:BD[13.163563] → [13.163563:163623]

    std::string itemname = Stash::stash_item_name(si.item);

[13.163563]

[13.163623]


    // mangle a temporary
    item_def temp_item = si.item;
    if ( shoptype_identifies_stock(this->shoptype) )
        temp_item.flags |= ISFLAG_IDENT_MASK;
           
    const std::string itemname = Stash::stash_item_name(temp_item);

Replacement in crawl-ref/source/stash.cc at line 658 [13.147324]
∅:D[14.500] → [13.163721:163745]
B:BD[13.163721] → [13.163721:163745]
```
    return shopitem;   
```
[14.500]
[13.163745]
```
    return shopitem;
```

Replacement in crawl-ref/source/stash.cc at line 665 [13.147324]

B:BD[13.163836] → [13.163836:163897]

    if (is_dumpable_artifact(si.item, Options.verbose_dump))

[13.163836]

[13.163897]


    // mangle a temporary
    item_def temp_item = si.item;
    if (shoptype_identifies_stock(this->shoptype))
        temp_item.flags |= ISFLAG_IDENT_MASK;
    if (is_dumpable_artifact(temp_item, Options.verbose_dump))

Replacement in crawl-ref/source/stash.cc at line 673 [13.147324]

B:BD[13.163903] → [13.163903:163967]

        desc = munge_description(get_item_description(si.item,

[13.163903]

[13.163967]

        desc = munge_description(get_item_description(temp_item,

Replacement in crawl-ref/source/stash.cc at line 688 [13.147324]

B:BD[13.164601] → [13.164601:164631]

    describe_item( si.item );

[13.164601]

[13.164631]

    // mangle a temporary
    item_def temp_item = si.item;
    if ( shoptype_identifies_stock(this->shoptype) )
        temp_item.flags |= ISFLAG_IDENT_MASK;
    describe_item( temp_item );

Deletion in crawl-ref/source/stash.cc at line 698 [13.147324]
B:BD[13.164735] → [13.164735:164760]
```
    ShopId id(shoptype);
```
Deletion in crawl-ref/source/stash.cc at line 757 [13.147324]
B:BD[13.166349] → [13.166349:166374]
```
    ShopId id(shoptype);
```
Deletion in crawl-ref/source/stash.cc at line 807 [13.147324]
B:BD[13.167542] → [13.167542:167568]
```
    ShopId id(shoptype);
```
Deletion in crawl-ref/source/shopping.h at line 20 [10.758673]
B:BD[13.192810] → [13.192810:192936]
∅:D[13.192936] → [10.758951:758952]
B:BD[10.758951] → [10.758951:758952]
```
void shop_init_id_type(int shoptype, id_fix_arr &shop_id);
void shop_uninit_id_type(int shoptype, const id_fix_arr &shop_id);
```

Deletion in crawl-ref/source/shopping.h at line 21 [10.758673]

B:BD[10.758995] → [10.758995:759244]


// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: chardump - invent - ouch - religion - shopping
 * *********************************************************************** */

Replacement in crawl-ref/source/shopping.h at line 24 [10.758673]

B:BD[10.759346] → [13.192937:193010]

∅:D[13.193010] → [10.759424:759649]

B:BD[10.759424] → [10.759424:759649]

unsigned int item_value( item_def item, id_arr id, bool ident = false );
// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: misc
 * *********************************************************************** */
void shop(void);

[10.759346]

[10.759649]

unsigned int item_value( item_def item, bool ident = false );
void shop();

Replacement in crawl-ref/source/shopping.h at line 35 [10.758673]

B:BD[6.209] → [6.209:511]

// Protect the id array against being clobbered by a SIGHUP with the
// character in a shop.
extern id_arr shop_backup_id;
class shopping_hup_protect
{
public:
    shopping_hup_protect() : shopping(crawl_state.shopping)
    {
        save_id(shop_backup_id);
        crawl_state.shopping = true;
    }

[6.209]

[10.759905]

bool shoptype_identifies_stock(int shoptype);

Deletion in crawl-ref/source/shopping.h at line 37 [10.758673]

B:BD[10.759906] → [6.512:626]

    ~shopping_hup_protect()
    {
        crawl_state.shopping = shopping;
    }
private:
    bool shopping;
};

Replacement in crawl-ref/source/shopping.cc at line 43 [10.759950]

B:BD[10.760662] → [13.193101:193148]

∅:D[13.193148] → [10.760714:760797]

B:BD[10.760714] → [10.760714:760797]

B:BD[10.760797] → [13.193149:193203]

∅:D[13.193203] → [10.760866:760924]

B:BD[10.760866] → [10.760866:760924]

B:BD[10.760924] → [13.193204:193264]

∅:D[13.193264] → [10.760999:761081]

B:BD[10.760999] → [10.760999:761081]

B:BD[10.761081] → [13.193265:193327]

static char in_a_shop(char shoppy, id_arr id);
static char more3(void);
static void purchase( int shop, int item_got, int cost );
static void shop_init_id(int i, id_fix_arr &shop_id);
static void shop_print(const char *shoppy, char sh_line);
static void shop_set_ident_type(int i, id_fix_arr &shop_id,
                                unsigned char base_type, unsigned char sub_type);
static void shop_uninit_id(int i, const id_fix_arr &shop_id);

[10.760662]

[11.166280]

static void in_a_shop(char shoppy);
static char more3();
static void purchase( int shop, int item_got, int cost);
static void shop_print(const char *shoppy, int sh_line);

Replacement in crawl-ref/source/shopping.cc at line 109 [10.759950]
∅:D[11.167759] → [13.193328:193369]
B:BD[10.761153] → [13.193328:193369]
```
char in_a_shop( char shoppy, id_arr id )
```
[11.167759]
[10.761199]
```
static void in_a_shop( char shoppy )
```

Replacement in crawl-ref/source/shopping.cc at line 111 [10.759950]

B:BD[10.761201] → [10.761201:761284]

    // easier to work with {dlb}
    unsigned int greedy = env.shop[shoppy].greed;

[10.761201]

[3.144]

    shop_struct& the_shop = env.shop[shoppy];

Deletion in crawl-ref/source/shopping.cc at line 115 [10.759950]
B:BD[10.761285] → [13.193370:193394]
```
    id_fix_arr shop_id;
```
Deletion in crawl-ref/source/shopping.cc at line 119 [10.759950]
B:BD[10.761436] → [10.761436:761448]
```
    char i;
```

Replacement in crawl-ref/source/shopping.cc at line 125 [10.759950]

B:BD[8.8767] → [8.8767:8844]

    ShopInfo &si = stashes.get_shop(env.shop[shoppy].x, env.shop[shoppy].y);

[8.8767]

[10.761635]

    ShopInfo &si = stashes.get_shop(the_shop.x, the_shop.y);

Replacement in crawl-ref/source/shopping.cc at line 127 [10.759950]

B:BD[10.761636] → [10.761636:761752]

    snprintf( info, INFO_SIZE, "Welcome to %s!", 
             shop_name(env.shop[shoppy].x, env.shop[shoppy].y) );

[10.761636]

[13.193501]

    snprintf(info, INFO_SIZE, "Welcome to %s!",
             shop_name(the_shop.x, the_shop.y) );

Deletion in crawl-ref/source/shopping.cc at line 135 [10.759950]
∅:D[15.1483] → [10.761793:761828]
∅:D[11.167856] → [10.761793:761828]
B:BD[10.761793] → [10.761793:761828]
```
    shop_init_id(shoppy, shop_id);
```

Replacement in crawl-ref/source/shopping.cc at line 136 [10.759950]

B:BD[10.761829] → [10.761829:762015]

    /* *************************************
    THINGS TO DO:
      Allow inventory
      Remove id change for antique shops
      selling?
    ************************************* */

[10.761829]

[10.762015]

    const bool id_stock = shoptype_identifies_stock(the_shop.type);

Deletion in crawl-ref/source/shopping.cc at line 138 [10.759950]
B:BD[10.762016] → [10.762016:762034]
```
    save_id(id);
```
Replacement in crawl-ref/source/shopping.cc at line 151 [10.759950]
B:BD[10.762234] → [10.762234:762263]
```
    for (i = 1; i < 20; i++)
```
[10.762234]
[10.762263]
```
    for (int i = 1; i < 20; i++)
```
Replacement in crawl-ref/source/shopping.cc at line 155 [10.759950]
B:BD[10.762304] → [10.762304:762368]
```
        if (itty == NON_ITEM)   //mitm.link [itty] == NON_ITEM)
```
[10.762304]
[10.762368]
```
        if (itty == NON_ITEM)
```
Replacement in crawl-ref/source/shopping.cc at line 167 [10.759950]
∅:D[11.167882] → [10.762525:762554]
B:BD[10.762525] → [10.762525:762554]
```
    for (i = 1; i < 18; i++)
```
[11.167882]
[10.762554]
```
    for (int i = 1; i < 18; i++)
```

Replacement in crawl-ref/source/shopping.cc at line 173 [10.759950]

B:BD[10.762752] → [10.762752:762810]

        gp_value = greedy * item_value( mitm[itty], id );

[10.762752]

[10.762810]

        gp_value = the_shop.greed * item_value(mitm[itty], id_stock);

Replacement in crawl-ref/source/shopping.cc at line 188 [10.759950]

B:BD[11.168160] → [14.1721:1783]

        cprintf("%s", mitm[itty].name(DESC_NOCAP_A).c_str());

[11.168160]

[11.168238]

        cprintf("%s", mitm[itty].name(DESC_NOCAP_A, false, id_stock).c_str());

Insertion in crawl-ref/source/shopping.cc at line 190 [10.759950]
[11.168239]
[13.193549]
```
#if 0
        // huh? XXX XXX does this code do anything?
```
Insertion in crawl-ref/source/shopping.cc at line 197 [10.759950]
[13.193861]
[13.193886]
```
#endif
```
Deletion in crawl-ref/source/shopping.cc at line 234 [10.759950]
B:BD[11.168560] → [11.168560:168601]
```
        shop_uninit_id(shoppy, shop_id);
```
Deletion in crawl-ref/source/shopping.cc at line 235 [10.759950]
B:BD[11.168633] → [11.168633:168672]
∅:D[11.168672] → [10.763652:763653]
B:BD[10.763652] → [10.763652:763653]
```
        shop_init_id(shoppy, shop_id);
```
Deletion in crawl-ref/source/shopping.cc at line 268 [10.759950]
B:BD[10.764341] → [10.764341:764382]
```
        shop_uninit_id(shoppy, shop_id);
```
Deletion in crawl-ref/source/shopping.cc at line 269 [10.759950]
B:BD[10.764409] → [10.764409:764448]
```
        shop_init_id(shoppy, shop_id);
```

Replacement in crawl-ref/source/shopping.cc at line 292 [10.759950]

B:BD[10.764971] → [10.764971:765040]

    gp_value = greedy * item_value( mitm[shop_items[ft]], id ) / 10;

[10.764971]

[10.765040]

    gp_value = the_shop.greed * item_value(mitm[shop_items[ft]], id_stock)/10;

Replacement in crawl-ref/source/shopping.cc at line 304 [10.759950]

B:BD[16.504] → [16.504:658]

    {        
        shop_set_ident_type( shoppy, shop_id, mitm[shop_items[ft]].base_type,
                             mitm[shop_items[ft]].sub_type );

[16.504]

[16.658]

    {
        if ( id_stock )
        {
            // Identify the item and its type.
            item_def& pitem = mitm[shop_items[ft]];
            set_ident_type(pitem.base_type, pitem.sub_type, ID_KNOWN_TYPE);
            set_ident_flags(pitem, ISFLAG_IDENT_MASK);
        }
        // purchase() will take the note if necessary.

Deletion in crawl-ref/source/shopping.cc at line 319 [10.759950]
B:BD[10.765416] → [10.765416:765436]
```
    //clear_line();
```
Deletion in crawl-ref/source/shopping.cc at line 322 [10.759950]
B:BD[10.765577] → [10.765577:765616]
```
    shop_uninit_id( shoppy, shop_id );
```

Deletion in crawl-ref/source/shopping.cc at line 323 [10.759950]

∅:D[11.168733] → [10.765616:765633]

B:BD[10.765616] → [10.765616:765633]

B:BD[10.765633] → [13.193941:193999]

∅:D[13.193999] → [10.765694:765696]

B:BD[10.765694] → [10.765694:765696]

B:BD[10.765696] → [13.194000:194128]

∅:D[13.194128] → [10.765874:765880]

B:BD[10.765874] → [10.765874:765880]

B:BD[10.765880] → [13.194129:194166]

∅:D[13.194166] → [10.765913:766481]

B:BD[10.765913] → [10.765913:766481]

B:BD[10.766481] → [13.194167:194220]

∅:D[13.194220] → [10.766544:766546]

B:BD[10.766544] → [10.766544:766546]

B:BD[10.766546] → [13.194221:194275]

∅:D[13.194275] → [10.766571:766572]

B:BD[10.766571] → [10.766571:766572]

B:BD[10.766572] → [13.194276:194472]

∅:D[13.194472] → [10.766724:766730]

B:BD[10.766724] → [10.766724:766730]

B:BD[10.766730] → [13.194473:194510]

∅:D[13.194510] → [10.766763:766773]

B:BD[10.766763] → [10.766763:766773]

B:BD[10.766773] → [13.194511:194923]

∅:D[13.194923] → [10.767101:767117]

B:BD[10.767101] → [10.767101:767117]

    return 0;
}
void shop_init_id_type(int shoptype, id_fix_arr &shop_id)
{
    if (shoptype != SHOP_WEAPON_ANTIQUE
        && shoptype != SHOP_ARMOUR_ANTIQUE
        && shoptype != SHOP_GENERAL_ANTIQUE)
    {
        for (int j = 0; j < 50; j++)
        {
            shop_id[ IDTYPE_WANDS ][j] = get_ident_type(OBJ_WANDS, j);
            set_ident_type(OBJ_WANDS, j, ID_KNOWN_TYPE);
            shop_id[ IDTYPE_SCROLLS ][j] = get_ident_type(OBJ_SCROLLS, j);
            set_ident_type(OBJ_SCROLLS, j, ID_KNOWN_TYPE);
            shop_id[ IDTYPE_JEWELLERY ][j] = get_ident_type(OBJ_JEWELLERY, j);
            set_ident_type(OBJ_JEWELLERY, j, ID_KNOWN_TYPE);
            shop_id[ IDTYPE_POTIONS ][j] = get_ident_type(OBJ_POTIONS, j);
            set_ident_type(OBJ_POTIONS, j, ID_KNOWN_TYPE);
        }
    }
}
static void shop_init_id(int i, id_fix_arr &shop_id)
{
    shop_init_id_type( env.shop[i].type, shop_id );
}
void shop_uninit_id_type(int shoptype, const id_fix_arr &shop_id)
{
    if (shoptype != SHOP_WEAPON_ANTIQUE
        && shoptype != SHOP_ARMOUR_ANTIQUE
        && shoptype != SHOP_GENERAL_ANTIQUE)
    {
        for (int j = 0; j < 50; j++)
        {
            set_ident_type( OBJ_WANDS, j, 
                    shop_id[ IDTYPE_WANDS ][j], true );
            set_ident_type( OBJ_SCROLLS, j, 
                    shop_id[ IDTYPE_SCROLLS ][j], true );
            set_ident_type( OBJ_JEWELLERY, j, 
                    shop_id[ IDTYPE_JEWELLERY ][j], true );
            set_ident_type( OBJ_POTIONS, j, 
                    shop_id[ IDTYPE_POTIONS ][j], true );
        }
    }

Replacement in crawl-ref/source/shopping.cc at line 325 [10.759950]
B:BD[10.767120] → [13.194924:194985]
```
static void shop_uninit_id(int i, const id_fix_arr &shop_id)
```
[10.767120]
[13.194985]
```
bool shoptype_identifies_stock(int shoptype)
```

Replacement in crawl-ref/source/shopping.cc at line 327 [10.759950]

B:BD[13.194987] → [13.194987:195039]

    shop_uninit_id_type(env.shop[i].type, shop_id);

[13.194987]

[13.195039]

    return
        shoptype != SHOP_WEAPON_ANTIQUE &&
        shoptype != SHOP_ARMOUR_ANTIQUE &&
        shoptype != SHOP_GENERAL_ANTIQUE;

Replacement in crawl-ref/source/shopping.cc at line 333 [10.759950]

B:BD[13.195042] → [13.195042:195096]

∅:D[13.195096] → [10.767189:767265]

B:BD[10.767189] → [10.767189:767265]

void shop_set_ident_type( int i, id_fix_arr &shop_id,
                          unsigned char base_type, unsigned char sub_type )

[13.195042]

[10.767265]

static void shop_print( const char *shoppy, int sh_lines )

Deletion in crawl-ref/source/shopping.cc at line 335 [10.759950]

B:BD[10.767267] → [10.767267:767976]

    if (env.shop[i].type != SHOP_WEAPON_ANTIQUE
        && env.shop[i].type != SHOP_ARMOUR_ANTIQUE
        && env.shop[i].type != SHOP_GENERAL_ANTIQUE)
    {
        switch (base_type)
        {
        case OBJ_WANDS:
            shop_id[ IDTYPE_WANDS ][sub_type] = ID_KNOWN_TYPE;
            break;
        case OBJ_SCROLLS:
            shop_id[ IDTYPE_SCROLLS ][sub_type] = ID_KNOWN_TYPE;
            break;
        case OBJ_JEWELLERY:
            shop_id[ IDTYPE_JEWELLERY ][sub_type] = ID_KNOWN_TYPE;
            break;
        case OBJ_POTIONS:
            shop_id[ IDTYPE_POTIONS ][sub_type] = ID_KNOWN_TYPE;
            break;
        }
    }
}
void shop_print( const char *shoppy, char sh_lines )
{

Replacement in crawl-ref/source/shopping.cc at line 343 [10.759950]
B:BD[10.768095] → [10.768095:768112]
```
char more3(void)
```
[10.768095]
[10.768112]
```
static char more3()
```
Replacement in crawl-ref/source/shopping.cc at line 494 [10.759950]
B:BD[10.771786] → [13.195136:195200]
```
unsigned int item_value( item_def item, id_arr id, bool ident )
```
[10.771786]
[10.771855]
```
unsigned int item_value( item_def item, bool ident )
```
Replacement in crawl-ref/source/shopping.cc at line 1054 [10.759950]
B:BD[10.784638] → [17.386:426]
∅:D[17.426] → [11.169854:169900]
B:BD[10.784693] → [11.169854:169900]
```
        else if (item_type_known(item) 
                && get_equip_desc(item) != 0)
```
[10.784638]
[10.784740]
```
        else if (item_type_known(item) && get_equip_desc(item) != 0)
```
Replacement in crawl-ref/source/shopping.cc at line 1067 [10.759950]
B:BD[10.784927] → [11.169901:169949]
```
        if (!id[ IDTYPE_WANDS ][item.sub_type])
```
[10.784927]
[11.169949]
```
        if ( !item_type_known(item) )
```
Replacement in crawl-ref/source/shopping.cc at line 1136 [10.759950]
B:BD[10.787369] → [10.787369:787404]
```
        if (!id[3][item.sub_type])
```
[10.787369]
[10.787404]
```
        if ( !item_type_known(item) )
```
Replacement in crawl-ref/source/shopping.cc at line 1247 [10.759950]
B:BD[10.790020] → [10.790020:790055]
```
        if (!id[1][item.sub_type])
```
[10.790020]
[10.790055]
```
        if ( !item_type_known(item) )
```
Insertion in crawl-ref/source/shopping.cc at line 1250 [10.759950]
[10.790094]
[10.790094]
```
        {
```
Insertion in crawl-ref/source/shopping.cc at line 1303 [10.759950]
[10.791635]
[10.791635]
```
        }
```
Deletion in crawl-ref/source/shopping.cc at line 1307 [10.759950]
B:BD[10.791675] → [10.791675:791737]
```
        if (!id[2][item.sub_type])
            valued += 50;
```

Replacement in crawl-ref/source/shopping.cc at line 1310 [10.759950]

B:BD[10.791797] → [10.791797:791835]

        if (id[2][item.sub_type] > 0)

[10.791797]

[10.791835]

        if ( !item_type_known(item) )
            valued += 50;
        else

Replacement in crawl-ref/source/shopping.cc at line 1404 [10.759950]

B:BD[10.794770] → [17.427:470]

∅:D[17.470] → [10.794826:795040]

B:BD[10.794826] → [10.794826:795040]

                if (item_type_known(item))
                {
                    if (valued < 0)
                        valued = randart_value( item ) - 5;
                    else
                        valued += randart_value( item );
                }

[10.794770]

[10.795040]

                // in this branch we're guaranteed to know
                // the item type!
                if (valued < 0)
                    valued = randart_value( item ) - 5;

Replacement in crawl-ref/source/shopping.cc at line 1409 [10.759950]

B:BD[10.795061] → [10.795061:795131]

                {
                    valued += 50;
                }

[10.795061]

[10.795131]

                    valued += randart_value( item );

Deletion in crawl-ref/source/shopping.cc at line 1469 [10.759950]
B:BD[10.796694] → [10.796694:796717]
```
    //case 10: break;
```

Replacement in crawl-ref/source/shopping.cc at line 1470 [10.759950]

B:BD[10.796737] → [17.507:554]

∅:D[17.554] → [10.796799:796875]

B:BD[10.796799] → [10.796799:796875]

        valued = 150 + (item_type_known(item) 
                                    ? book_rarity(item.sub_type) * 50 : 0);

[10.796737]

[10.796875]

        valued = 150;
        if (item_type_known(item))
            valued += book_rarity(item.sub_type) * 50;

Replacement in crawl-ref/source/shopping.cc at line 1506 [10.759950]
∅:D[12.509] → [10.797547:797563]
B:BD[10.797547] → [10.797547:797563]
```
void shop(void)
```
[12.92]
[10.797563]
```
void shop()
```
Replacement in crawl-ref/source/shopping.cc at line 1508 [10.759950]
B:BD[10.797565] → [10.797565:797590]
```
    unsigned char i = 0;
```
[10.797565]
[10.797590]
```
    int i;
```
Replacement in crawl-ref/source/shopping.cc at line 1518 [10.759950]
B:BD[10.797759] → [10.797759:797800]
```
        mpr("Help! Non-existent shop.");
```
[10.797759]
[10.797800]
```
        mpr("Help! Non-existent shop.", MSGCH_DANGER);
```
Replacement in crawl-ref/source/shopping.cc at line 1522 [10.759950]
B:BD[10.797823] → [13.195201:195220]
∅:D[13.195220] → [10.797847:797870]
B:BD[10.797847] → [10.797847:797870]
B:BD[10.797870] → [12.510:586]
```
    id_arr identy;
    save_id(identy);
    {
        shopping_hup_protect shp;
        in_a_shop(i, identy);
    }
```
[10.797823]
[12.586]
```
    in_a_shop(i);
```
Replacement in crawl-ref/source/religion.cc at line 2502 [10.804403]
B:BD[18.420] → [18.420:498]
```
    
    char subst_id[4][50];
    memset(subst_id, 1, sizeof subst_id);
    
```
[18.420]
[18.498]
```
       
```

Replacement in crawl-ref/source/religion.cc at line 2511 [10.804403]

B:BD[10.880035] → [10.880035:880100]

        const int value = item_value( mitm[i], subst_id, true );

[10.880035]

[10.880100]

        const int value = item_value( mitm[i], true );

Replacement in crawl-ref/source/itemprop.cc at line 401 [11.646661]
B:BD[11.665009] → [11.665009:665036]
```
void init_properties(void)
```
[11.665009]
[11.665036]
```
void init_properties()
```

Replacement in crawl-ref/source/itemprop.cc at line 463 [11.646661]

B:BD[11.666387] → [14.9129:9208]

    if ( !known_before && fully_identified(item) && is_interesting_item(item))

[11.666387]

[14.9208]

    if ( notes_are_active() &&
         !known_before && fully_identified(item) && is_interesting_item(item))

Deletion in crawl-ref/source/itemname.h at line 20 [10.2661173]

B:BD[10.2661478] → [10.2661478:2661689]

B:BD[10.2661689] → [19.8637:8676]

∅:D[19.8676] → [10.2661729:2661730]

B:BD[10.2661729] → [10.2661729:2661730]


/* ***********************************************************************
 * called from: describe - effects - item_use - shopping
 * *********************************************************************** */
char get_ident_type(char cla, int ty);

Deletion in crawl-ref/source/itemname.h at line 33 [10.2661173]
B:BD[10.2663039] → [10.2663039:2663235]
∅:D[11.709100] → [10.2663564:2663565]
B:BD[10.2663564] → [10.2663564:2663565]
∅:D[11.709180] → [10.2664011:2664012]
B:BD[10.2664011] → [10.2664011:2664012]
```
/* ***********************************************************************
 * called from: acr
 * *********************************************************************** */
void clear_ids(void);
```

Replacement in crawl-ref/source/itemname.h at line 53 [10.2661173]

B:BD[10.2666154] → [10.2666154:2666355]

/* ***********************************************************************
 * called from: acr
 * *********************************************************************** */
void init_properties(void);

[10.2666154]

[10.2666355]

bool is_interesting_item( const item_def& item );

Deletion in crawl-ref/source/itemname.h at line 56 [10.2661173]
∅:D[11.709378] → [10.2666684:2666685]
B:BD[10.2666684] → [10.2666684:2666685]
B:BD[10.2666686] → [10.2666686:2666872]
B:BD[10.2666872] → [12.680:735]
∅:D[12.735] → [10.2666906:2666907]
B:BD[10.2666906] → [10.2666906:2666907]
```
/* ***********************************************************************
 * called from: files - shopping
 * *********************************************************************** */
void save_id(id_arr identy, bool saving_game = false);
```
Replacement in crawl-ref/source/itemname.h at line 58 [10.2661173]
B:BD[10.2666983] → [10.2666983:2667054]
```
 * called from: files - item_use - newgame - ouch - shopping - spells1
```
[10.2666983]
[10.2667054]
```
 * called from: acr
```
Replacement in crawl-ref/source/itemname.h at line 60 [10.2661173]
B:BD[10.2667132] → [19.8677:8752]
```
void set_ident_type( char cla, int ty, char setting, bool force = false );
```
[10.2667132]
[10.2667208]
```
void init_properties();
```

Insertion in crawl-ref/source/itemname.h at line 62 [10.2661173]

[10.2667209]

id_arr& get_typeid_array();
item_type_id_state_type get_ident_type(int basetype, int subtype);
void set_ident_type( int basetype, int subtype,
                     item_type_id_state_type setting, bool force = false);

Deletion in crawl-ref/source/itemname.h at line 67 [10.2661173]

B:BD[10.2667210] → [10.2667210:2667449]

B:BD[10.2667449] → [11.709379:709429]

/* ***********************************************************************
 * called from: dungeon - item_use
 * *********************************************************************** */
bool hide2armour( unsigned char *which_subtype );
bool is_interesting_item( const item_def& item );

Replacement in crawl-ref/source/itemname.cc at line 41 [10.2667494]
B:BD[12.738] → [12.738:749]
```
id_arr id;
```
[12.738]
[10.2668259]
```
id_arr type_ids;
```
Deletion in crawl-ref/source/itemname.cc at line 43 [10.2667494]
B:BD[10.2668260] → [12.750:880]
∅:D[12.880] → [10.2668260:2668261]
∅:D[11.709529] → [10.2668260:2668261]
B:BD[10.2668260] → [10.2668260:2668261]
```
// Backup of the id array used to save ids if the game receives SIGHUP
// when the character is in a shop.
id_arr shop_backup_id;
```
Replacement in crawl-ref/source/itemname.cc at line 44 [10.2667494]
B:BD[11.709576] → [11.709576:709621]
```
static bool is_random_name_vowel( char let);
```
[11.709576]
[10.2668330]
```
static bool is_random_name_vowel( char let );
```

Replacement in crawl-ref/source/itemname.cc at line 54 [10.2667494]

B:BD[20.271] → [20.271:332]

        return id[IDTYPE_SCROLLS][subtype] == ID_TRIED_TYPE;

[20.271]

[20.332]

        return type_ids[IDTYPE_SCROLLS][subtype] == ID_TRIED_TYPE;

Replacement in crawl-ref/source/itemname.cc at line 56 [10.2667494]

B:BD[20.354] → [20.354:415]

        return id[IDTYPE_POTIONS][subtype] == ID_TRIED_TYPE;

[20.354]

[20.415]

        return type_ids[IDTYPE_POTIONS][subtype] == ID_TRIED_TYPE;

Replacement in crawl-ref/source/itemname.cc at line 58 [10.2667494]

B:BD[20.435] → [20.435:494]

        return id[IDTYPE_WANDS][subtype] == ID_TRIED_TYPE;

[20.435]

[20.494]

        return type_ids[IDTYPE_WANDS][subtype] == ID_TRIED_TYPE;

Replacement in crawl-ref/source/itemname.cc at line 67 [10.2667494]

B:BD[10.2668628] → [10.2668628:2668710]

B:BD[10.2669461] → [10.2669461:2669463]

B:BD[10.2669470] → [10.2669470:2669471]

B:BD[10.2669471] → [5.474:806]

∅:D[5.806] → [13.359899:359946]

B:BD[13.359899] → [13.359899:359946]

B:BD[13.359946] → [5.807:1025]


    return (low == 'a' || low == 'e' || low == 'i' || low == 'o' || low == 'u');
}
item_type_id_type objtype_to_idtype(int base_type)
{
    switch (base_type)
    {
    case OBJ_WANDS:     return (IDTYPE_WANDS);
    case OBJ_SCROLLS:   return (IDTYPE_SCROLLS);
    case OBJ_JEWELLERY: return (IDTYPE_JEWELLERY);
    case OBJ_POTIONS:   return (IDTYPE_POTIONS);
    default:            return (NUM_IDTYPE);
    }
}
bool item_type_known( const item_def &item )
{
    if (item_ident(item, ISFLAG_KNOW_TYPE))
        return (true);
    const item_type_id_type idt = objtype_to_idtype(item.base_type);
    return (idt != NUM_IDTYPE? id[idt][item.sub_type] == ID_KNOWN_TYPE : false);

[10.2668628]

[10.2672701]

    return (low == 'a' || low == 'e' || low == 'i' ||
            low == 'o' || low == 'u');

Replacement in crawl-ref/source/itemname.cc at line 86 [10.2667494]

B:BD[14.9769] → [14.9769:9814]

                           bool terse) const

[14.9769]

[10.2676864]

                           bool terse, bool ident) const

Replacement in crawl-ref/source/itemname.cc at line 92 [10.2667494]
B:BD[10.2677104] → [14.9890:9927]
```
    this->name_aux(itm_name, terse);
```
[10.2677104]
[10.2677124]
```
    this->name_aux(itm_name, terse, ident);
```

Replacement in crawl-ref/source/itemname.cc at line 107 [10.2667494]

B:BD[14.10079] → [14.10079:10326]

        || (item_type_known( *this )
            && ((this->base_type == OBJ_MISCELLANY
                 && this->sub_type == MISC_HORN_OF_GERYON)
                || (is_fixed_artefact( *this )
                || (is_random_artefact( *this ))))))

[14.10079]

[10.2677774]

        || ( (ident || item_type_known( *this ))
             && ((this->base_type == OBJ_MISCELLANY
                  && this->sub_type == MISC_HORN_OF_GERYON)
                 || (is_fixed_artefact( *this )
                     || (is_random_artefact( *this ))))))

Replacement in crawl-ref/source/itemname.cc at line 273 [10.2667494]
B:BD[10.2682307] → [14.11412:11468]
```
void item_def::name_aux( char* buff, bool terse ) const
```
[10.2682307]
[10.2682418]
```
void item_def::name_aux( char* buff, bool terse, bool ident ) const
```
Insertion in crawl-ref/source/itemname.cc at line 275 [10.2667494]
[10.2682420]
[14.11469]
```
    // Shortcuts
```

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

[10.2682617]

    const bool know_curse = ident || item_ident(*this, ISFLAG_KNOW_CURSE);
    const bool know_type = ident || item_type_known(*this);
    const bool know_pluses = ident || item_ident(*this, ISFLAG_KNOW_PLUSES);

Replacement in crawl-ref/source/itemname.cc at line 294 [10.2667494]
B:BD[10.2682789] → [14.11634:11696]
```
        if (item_ident( *this, ISFLAG_KNOW_CURSE ) && !terse)
```
[10.2682789]
[10.2682850]
```
        if (know_curse && !terse)
```

Replacement in crawl-ref/source/itemname.cc at line 305 [10.2667494]

B:BD[10.2683426] → [14.11810:11875]

                    && !item_ident( *this, ISFLAG_KNOW_PLUSES ))

[10.2683426]

[10.2683493]

                    && !know_pluses)

Replacement in crawl-ref/source/itemname.cc at line 311 [10.2667494]
B:BD[10.2683592] → [14.11876:11929]
```
        if (item_ident( *this, ISFLAG_KNOW_PLUSES ))
```
[10.2683592]
[10.2683644]
```
        if (know_pluses)
```
Replacement in crawl-ref/source/itemname.cc at line 346 [10.2667494]
B:BD[10.2684632] → [14.12079:12121]
```
            if (item_type_known( *this ))
```
[10.2684632]
[10.2684686]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 394 [10.2667494]
B:BD[10.2687926] → [14.14769:14833]
```
        if (!item_ident( *this, ISFLAG_KNOW_PLUSES ) && !terse)
```
[10.2687926]
[10.2687992]
```
        if (!know_pluses && !terse)
```
Replacement in crawl-ref/source/itemname.cc at line 424 [10.2667494]
B:BD[10.2688845] → [14.14966:15012]
```
        if (item_type_known(*this) && !terse)
```
[10.2688845]
[10.2688905]
```
        if (know_type && !terse)
```
Replacement in crawl-ref/source/itemname.cc at line 432 [10.2667494]
B:BD[10.2689163] → [14.15083:15121]
```
        if (item_type_known( *this ))
```
[10.2689163]
[10.2689213]
```
        if (know_type)
```

Replacement in crawl-ref/source/itemname.cc at line 527 [10.2667494]

B:BD[10.2692484] → [14.15218:15299]

        if (item_ident(*this, ISFLAG_KNOW_CURSE) && item_cursed(*this) && terse)

[10.2692484]

[10.2692563]

        if (know_curse && item_cursed(*this) && terse)

Replacement in crawl-ref/source/itemname.cc at line 542 [10.2667494]
B:BD[10.2692868] → [14.15344:15397]
```
        if (item_ident( *this, ISFLAG_KNOW_PLUSES ))
```
[10.2692868]
[10.2692920]
```
        if (know_pluses)
```
Replacement in crawl-ref/source/itemname.cc at line 577 [10.2667494]
B:BD[10.2694149] → [14.15518:15556]
```
        if (item_type_known( *this ))
```
[10.2694149]
[10.2694199]
```
        if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 590 [10.2667494]
B:BD[10.2694618] → [14.15557:15619]
```
        if (item_ident( *this, ISFLAG_KNOW_CURSE ) && !terse)
```
[10.2694618]
[10.2694679]
```
        if (know_curse && !terse)
```

Replacement in crawl-ref/source/itemname.cc at line 595 [10.2667494]

B:BD[10.2694828] → [14.15659:15724]

                    && !item_ident( *this, ISFLAG_KNOW_PLUSES ))

[10.2694828]

[10.2694895]

                    && !know_pluses)

Replacement in crawl-ref/source/itemname.cc at line 601 [10.2667494]
B:BD[10.2694994] → [14.15725:15778]
```
        if (item_ident( *this, ISFLAG_KNOW_PLUSES ))
```
[10.2694994]
[10.2695046]
```
        if (know_pluses)
```
Replacement in crawl-ref/source/itemname.cc at line 626 [10.2667494]
B:BD[10.2695798] → [14.15892:15956]
```
        if (!item_ident( *this, ISFLAG_KNOW_PLUSES ) && !terse)
```
[10.2695798]
[10.2695864]
```
        if (!know_pluses && !terse)
```
Replacement in crawl-ref/source/itemname.cc at line 671 [10.2667494]
B:BD[10.2697376] → [14.16164:16225]
```
        if (item_type_known(*this) && sparm != SPARM_NORMAL)
```
[10.2697376]
[10.2697451]
```
        if (know_type && sparm != SPARM_NORMAL)
```

Replacement in crawl-ref/source/itemname.cc at line 723 [10.2667494]

B:BD[10.2700376] → [14.16226:16307]

        if (item_ident(*this, ISFLAG_KNOW_CURSE) && item_cursed(*this) && terse)

[10.2700376]

[10.2700455]

        if (know_curse && item_cursed(*this) && terse)

Replacement in crawl-ref/source/itemname.cc at line 729 [10.2667494]
B:BD[10.2700583] → [14.16308:16344]
```
        if (item_type_known(*this))
```
[10.2700583]
[10.2700694]
```
        if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 796 [10.2667494]
B:BD[10.2704023] → [14.16446:16499]
```
        if (item_ident( *this, ISFLAG_KNOW_PLUSES ))
```
[10.2704023]
[10.2704075]
```
        if (know_pluses)
```
Replacement in crawl-ref/source/itemname.cc at line 810 [10.2667494]
B:BD[10.2704455] → [14.16500:16536]
```
        if (item_type_known(*this))
```
[10.2704455]
[10.2704568]
```
        if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 975 [10.2667494]
B:BD[10.2711521] → [14.17075:17111]
```
        if (item_type_known(*this))
```
[10.2711521]
[10.2711634]
```
        if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1024 [10.2667494]
B:BD[10.2714145] → [14.17212:17264]
```
        if (item_ident( *this, ISFLAG_KNOW_CURSE ))
```
[10.2714145]
[10.2714196]
```
        if (know_curse)
```

Replacement in crawl-ref/source/itemname.cc at line 1029 [10.2667494]

B:BD[11.714084] → [11.714084:714114]

B:BD[11.714114] → [14.17304:17419]

                    && !terse
                    && (!ring_has_pluses(*this)
                        || !item_ident(*this, ISFLAG_KNOW_PLUSES))

[11.714084]

[11.714227]

                     && !terse
                     && (!ring_has_pluses(*this) || !know_pluses)

Replacement in crawl-ref/source/itemname.cc at line 1046 [10.2667494]
B:BD[10.2714658] → [14.17585:17621]
```
        if (item_type_known(*this))
```
[10.2714658]
[10.2714773]
```
        if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1049 [10.2667494]
B:BD[10.2714784] → [14.17622:17678]
```
            if (item_ident( *this, ISFLAG_KNOW_PLUSES )
```
[10.2714784]
[10.2714839]
```
            if (know_pluses
```
Replacement in crawl-ref/source/itemname.cc at line 1417 [10.2667494]
B:BD[10.2728659] → [14.18241:18281]
```
            if (item_type_known(*this))
```
[10.2728659]
[10.2728713]
```
            if (know_type)
```

Replacement in crawl-ref/source/itemname.cc at line 1426 [10.2667494]

B:BD[10.2728986] → [14.18282:18346]

            strncat(buff, !item_type_known(*this)  ? "cards"  :

[10.2728986]

[10.2729067]

            strncat(buff, !know_type  ? "cards"  :

Replacement in crawl-ref/source/itemname.cc at line 1439 [10.2667494]
B:BD[10.2729674] → [14.18347:18387]
```
            if (item_type_known(*this))
```
[10.2729674]
[10.2729728]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1452 [10.2667494]
B:BD[10.2730247] → [14.18388:18428]
```
            if (item_type_known(*this))
```
[10.2730247]
[10.2730301]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1459 [10.2667494]
B:BD[10.2730509] → [14.18429:18469]
```
            if (item_type_known(*this))
```
[10.2730509]
[10.2730563]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1466 [10.2667494]
B:BD[10.2730775] → [14.18470:18510]
```
            if (item_type_known(*this))
```
[10.2730775]
[10.2730829]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1473 [10.2667494]
B:BD[10.2731047] → [14.18511:18551]
```
            if (item_type_known(*this))
```
[10.2731047]
[10.2731101]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1478 [10.2667494]
B:BD[10.2731218] → [14.18552:18593]
```
            if (!item_type_known(*this))
```
[10.2731218]
[10.2731276]
```
            if (!know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1482 [10.2667494]
B:BD[10.2731387] → [14.18594:18634]
```
            if (item_type_known(*this))
```
[10.2731387]
[10.2731441]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1487 [10.2667494]
B:BD[10.2731557] → [14.18635:18676]
```
            if (!item_type_known(*this))
```
[10.2731557]
[10.2731615]
```
            if (!know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1491 [10.2667494]
B:BD[10.2731725] → [14.18677:18717]
```
            if (item_type_known(*this))
```
[10.2731725]
[10.2731779]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1496 [10.2667494]
B:BD[10.2731894] → [14.18718:18759]
```
            if (!item_type_known(*this))
```
[10.2731894]
[10.2731952]
```
            if (!know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1500 [10.2667494]
B:BD[10.2732060] → [14.18760:18800]
```
            if (item_type_known(*this))
```
[10.2732060]
[10.2732114]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1505 [10.2667494]
B:BD[10.2732240] → [14.18801:18842]
```
            if (!item_type_known(*this))
```
[10.2732240]
[10.2732298]
```
            if (!know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1509 [10.2667494]
B:BD[10.2732414] → [14.18843:18883]
```
            if (item_type_known(*this))
```
[10.2732414]
[10.2732468]
```
            if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1514 [10.2667494]
B:BD[10.2732593] → [14.18884:18937]
```
            strncat(buff, (!item_type_known(*this)) 
```
[10.2732593]
[10.2732663]
```
            strncat(buff, (!know_type) 
```
Replacement in crawl-ref/source/itemname.cc at line 1531 [10.2667494]
B:BD[10.2733134] → [14.18938:18975]
```
        if (!item_type_known(*this))
```
[10.2733134]
[10.2733188]
```
        if (!know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1628 [10.2667494]
B:BD[10.2738372] → [14.19077:19114]
```
        if (!item_type_known(*this))
```
[10.2738372]
[10.2738426]
```
        if (!know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1665 [10.2667494]
B:BD[10.2740087] → [14.20739:20775]
```
        if (item_type_known(*this))
```
[10.2740087]
[10.2740137]
```
        if (know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1696 [10.2667494]
B:BD[14.20809] → [14.20809:20848]
```
            && item_type_known(*this))
```
[14.20809]
[11.715080]
```
            && know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1742 [10.2667494]
B:BD[13.360285] → [14.21096:21138]
```
    if (!terse && item_type_known(*this))
```
[13.360285]
[13.360339]
```
    if (!terse && know_type)
```
Replacement in crawl-ref/source/itemname.cc at line 1825 [10.2667494]
B:BD[10.2745542] → [12.881:927]
```
void save_id(id_arr identy, bool saving_game)
```
[10.2745542]
[10.2745575]
```
item_type_id_type objtype_to_idtype(int base_type)
```

Replacement in crawl-ref/source/itemname.cc at line 1827 [10.2667494]

B:BD[10.2745577] → [12.928:1043]

∅:D[12.1043] → [10.2745737:2745786]

B:BD[10.2745737] → [10.2745737:2745786]

    memcpy(identy,
           (!saving_game || !crawl_state.shopping)? id : shop_backup_id,
           sizeof id);
}                               // end save_id()

[10.2745577]

[10.2745786]

    switch (base_type)
    {
    case OBJ_WANDS:     return (IDTYPE_WANDS);
    case OBJ_SCROLLS:   return (IDTYPE_SCROLLS);
    case OBJ_JEWELLERY: return (IDTYPE_JEWELLERY);
    case OBJ_POTIONS:   return (IDTYPE_POTIONS);
    default:            return (NUM_IDTYPE);
    }
}

Replacement in crawl-ref/source/itemname.cc at line 1837 [10.2667494]
B:BD[10.2745787] → [10.2745787:2745808]
```
void clear_ids(void)
```
[10.2745787]
[10.2745808]
```
bool item_type_known( const item_def &item )
```
Insertion in crawl-ref/source/itemname.cc at line 1839 [10.2667494]
[10.2745810]
[10.2745810]
```
    if (item_ident(item, ISFLAG_KNOW_TYPE))
        return (true);
```

Replacement in crawl-ref/source/itemname.cc at line 1842 [10.2667494]

B:BD[10.2745811] → [19.8837:8859]

    int i = 0, j = 0;

[10.2745811]

[10.2745834]

    const item_type_id_type idt = objtype_to_idtype(item.base_type);
    if ( idt != NUM_IDTYPE )
        return ( type_ids[idt][item.sub_type] == ID_KNOWN_TYPE );
    else
        return false;
}

Replacement in crawl-ref/source/itemname.cc at line 1849 [10.2667494]

B:BD[10.2745835] → [10.2745835:2746021]

    for (i = 0; i < 4; i++)
    {
        for (j = 0; j < 50; j++)
        {
            id[i][j] = ID_UNKNOWN_TYPE;
        }
    }
}                               // end clear_ids()

[10.2745835]

[10.2746021]

id_arr& get_typeid_array()
{
    return type_ids;
}

Replacement in crawl-ref/source/itemname.cc at line 1854 [10.2667494]

B:BD[10.2746022] → [19.8860:8926]

void set_ident_type( char cla, int ty, char setting, bool force )

[10.2746022]

[10.2746089]

void set_ident_type( int basetype, int subtype,
                     item_type_id_state_type setting, bool force )

Replacement in crawl-ref/source/itemname.cc at line 1860 [10.2667494]

B:BD[10.2746214] → [10.2746214:2746269]

        && get_ident_type( cla, ty ) == ID_KNOWN_TYPE)

[10.2746214]

[10.2746269]

        && get_ident_type( basetype, subtype ) == ID_KNOWN_TYPE)

Deletion in crawl-ref/source/itemname.cc at line 1864 [10.2667494]

B:BD[10.2746297] → [10.2746297:2746480]


    switch (cla)
    {
    case OBJ_WANDS:
        id[ IDTYPE_WANDS ][ty] = setting;
        break;
    case OBJ_SCROLLS:
        id[ IDTYPE_SCROLLS ][ty] = setting;
        break;

Replacement in crawl-ref/source/itemname.cc at line 1865 [10.2667494]

B:BD[10.2746481] → [10.2746481:2746566]

    case OBJ_JEWELLERY:
        id[ IDTYPE_JEWELLERY ][ty] = setting;
        break;

[10.2746481]

[10.2746566]

    const item_type_id_type idt = objtype_to_idtype(basetype);

Replacement in crawl-ref/source/itemname.cc at line 1867 [10.2667494]

B:BD[10.2746567] → [10.2746567:2746739]

    case OBJ_POTIONS:
        id[ IDTYPE_POTIONS ][ty] = setting;
        break;
    default:
        break;
    }
}                               // end set_ident_type()

[10.2746567]

[10.2746739]

    if ( idt != NUM_IDTYPE )
        type_ids[idt][subtype] = setting;
}

Replacement in crawl-ref/source/itemname.cc at line 1871 [10.2667494]
B:BD[10.2746740] → [19.8927:8965]
```
char get_ident_type(char cla, int ty)
```
[10.2746740]
[10.2746779]
```
item_type_id_state_type get_ident_type(int basetype, int subtype)
```

Replacement in crawl-ref/source/itemname.cc at line 1873 [10.2667494]

B:BD[10.2746781] → [10.2746781:2746863]

    switch (cla)
    {
    case OBJ_WANDS:
        return id[ IDTYPE_WANDS ][ty];

[10.2746781]

[10.2746863]

    const item_type_id_type idt = objtype_to_idtype(basetype);
    if ( idt != NUM_IDTYPE && subtype < type_ids.height() )
        return type_ids[idt][subtype];
    else
        return ID_UNKNOWN_TYPE;
}

Deletion in crawl-ref/source/itemname.cc at line 1880 [10.2667494]

B:BD[10.2746864] → [10.2746864:2747170]

    case OBJ_SCROLLS:
        return id[ IDTYPE_SCROLLS ][ty];
    case OBJ_JEWELLERY:
        return id[ IDTYPE_JEWELLERY ][ty];
    case OBJ_POTIONS:
        return id[ IDTYPE_POTIONS ][ty];
    default:
        return (ID_UNKNOWN_TYPE);
    }
}                               // end get_ident_type()

Replacement in crawl-ref/source/itemname.cc at line 1884 [10.2667494]
B:BD[11.715653] → [14.21567:21623]
∅:D[14.21623] → [11.715709:715738]
B:BD[11.715709] → [11.715709:715738]
```
    const std::string txt = ie->item->name(DESC_PLAIN);
    newme->text = " " + txt;
```
[11.715653]
[11.715738]
```
    newme->text = std::string(" ") + ie->item->name(DESC_PLAIN);
```
Deletion in crawl-ref/source/itemname.cc at line 1893 [10.2667494]
B:BD[10.2747786] → [11.715829:715842]
∅:D[11.715842] → [10.2753501:2753502]
B:BD[10.2753501] → [10.2753501:2753502]
```
    int i,j;
```

Replacement in crawl-ref/source/itemname.cc at line 1895 [10.2667494]

B:BD[10.2753691] → [11.715884:716112]

    int idx_to_objtype[4] = { OBJ_WANDS, OBJ_SCROLLS,
                              OBJ_JEWELLERY, OBJ_POTIONS };
    int idx_to_maxtype[4] = { NUM_WANDS, NUM_SCROLLS,
                              NUM_JEWELLERY, NUM_POTIONS };

[10.2753691]

[10.2753940]

    const int idx_to_objtype[4] = { OBJ_WANDS, OBJ_SCROLLS,
                                    OBJ_JEWELLERY, OBJ_POTIONS };
    const int idx_to_maxtype[4] = { NUM_WANDS, NUM_SCROLLS,
                                    NUM_JEWELLERY, NUM_POTIONS };

Replacement in crawl-ref/source/itemname.cc at line 1900 [10.2667494]

B:BD[10.2753941] → [11.716113:716238]

    for (i = 0; i < 4; i++) {
        for (j = 0; j < idx_to_maxtype[i]; j++) {
            if (id[i][j] == ID_KNOWN_TYPE) {

[10.2753941]

[11.716238]

    for (int i = 0; i < 4; i++)
    {
        for (int j = 0; j < idx_to_maxtype[i]; j++)
        {
            if (type_ids[i][j] == ID_KNOWN_TYPE)
            {

Replacement in crawl-ref/source/itemname.cc at line 1907 [10.2667494]

B:BD[11.716285] → [11.716285:716320]

                if ( ptmp != 0 ) {

[11.716285]

[11.716320]

                if ( ptmp != 0 )
                {

Replacement in crawl-ref/source/itemname.cc at line 1921 [10.2667494]
B:BD[11.716659] → [11.716659:716674]
```
    else {    
```
[11.716659]
[11.716674]
```
    else
    {
```
Replacement in crawl-ref/source/item_use.cc at line 2001 [10.2781507]
B:BD[10.2833466] → [10.2833466:2833497]
```
    int ident = ID_TRIED_TYPE;
```
[10.2830767]
[10.2833497]
```
    item_type_id_state_type ident = ID_TRIED_TYPE;
```
Deletion in crawl-ref/source/invent.h at line 57 [10.2919073]
B:BD[11.768132] → [11.768132:768164]
```
    static char temp_id[4][50];
```

Replacement in crawl-ref/source/invent.cc at line 102 [10.2920632]

B:BD[13.370608] → [11.773067:773121]

        int value = item_value(*item, temp_id, true);

[13.370608]

[11.773121]

        const int value = item_value(*item, show_prices);

Deletion in crawl-ref/source/invent.cc at line 167 [10.2920632]
B:BD[11.774488] → [11.774488:774519]
```
char InvEntry::temp_id[4][50];
```
Replacement in crawl-ref/source/invent.cc at line 170 [10.2920632]
B:BD[11.774566] → [11.774566:774598]
∅:D[11.774598] → [13.371054:371060]
B:BD[13.371054] → [13.371054:371060]
B:BD[13.371060] → [11.774599:774649]
```
    if ((show_prices = doshow))
    {
        memset(temp_id, 1, sizeof temp_id);
    }
```
[11.774566]
[11.774649]
```
    show_prices = doshow;
```
Deletion in crawl-ref/source/hiscores.cc at line 1066 [10.2987663]
B:BD[11.825272] → [11.825272:825297]
```
    char temp_id[4][50];
```

Deletion in crawl-ref/source/hiscores.cc at line 1067 [10.2987663]

B:BD[11.825298] → [11.825298:825411]

    for (int d = 0; d < 4; d++)
    {
        for (int e = 0; e < 50; e++)
            temp_id[d][e] = 1;
    }

Replacement in crawl-ref/source/hiscores.cc at line 1084 [10.2987663]
∅:D[21.6135] → [11.825847:825914]
B:BD[11.825847] → [11.825847:825914]
```
                points += item_value( you.inv[d], temp_id, true );
```
[21.6135]
[11.825914]
```
                points += item_value( you.inv[d], true );
```

Replacement in crawl-ref/source/externs.h at line 434 [10.3270163]

B:BD[14.27350] → [14.27350:27398]

                     bool terse = false) const;

[14.27350]

[14.27398]

                     bool terse = false, bool ident = false) const;

Replacement in crawl-ref/source/externs.h at line 441 [10.3270163]
B:BD[14.27409] → [14.27409:27460]
```
    void name_aux( char* buff, bool terse ) const;
```
[14.27409]
[10.3275464]
```
    void name_aux( char* buff, bool terse, bool ident ) const;
```

Replacement in crawl-ref/source/externs.h at line 1544 [10.3270163]

B:BD[11.903196] → [12.1211:1285]

typedef FixedArray < int, 4, 50 > id_fix_arr;
typedef char id_arr[4][50];

[11.903196]

[12.1285]

typedef FixedArray < item_type_id_state_type, 4, 50 > id_arr;

Insertion in crawl-ref/source/describe.cc at line 28 [10.3736416]
[10.3737289]
[10.3737289]
```
#include <sstream>
#include <iomanip>
```

Replacement in crawl-ref/source/describe.cc at line 3247 [10.3736416]

B:BD[10.3840407] → [11.987556:987638]

std::string get_item_description( const item_def &item, bool verbose, bool dump )

[10.3840407]

[10.3840489]

std::string get_item_description( const item_def &item, bool verbose,
                                  bool dump )

Replacement in crawl-ref/source/describe.cc at line 3250 [10.3736416]
B:BD[10.3840491] → [10.3840491:3840550]
```
    std::string description;
    description.reserve(500);
```
[10.3840491]
[10.3840550]
```
    std::ostringstream description;
```
Replacement in crawl-ref/source/describe.cc at line 3253 [10.3736416]
B:BD[10.3840566] → [14.28400:28456]
```
        description += item.name(DESC_INVENTORY_EQUIP);
```
[10.3840566]
[10.3840723]
```
        description << item.name(DESC_INVENTORY_EQUIP);
```
Replacement in crawl-ref/source/describe.cc at line 3255 [10.3736416]
B:BD[10.3840724] → [10.3840724:3840749]
```
    description += "$$";
```
[10.3840724]
[10.3840749]
```
    description << "$$";
```

Replacement in crawl-ref/source/describe.cc at line 3260 [10.3736416]

B:BD[10.3840793] → [10.3840793:3841313]

        snprintf( info, INFO_SIZE, 
                  "base: %d; sub: %d; plus: %d; plus2: %d; special: %ld$"
                  "quant: %d; colour: %d; flags: 0x%08lx$"
                  "x: %d; y: %d; link: %d$ident_type: %d$$", 
                  item.base_type, item.sub_type, item.plus, item.plus2,
                  item.special, item.quantity, item.colour, item.flags,
                  item.x, item.y, item.link, 
                  get_ident_type( item.base_type, item.sub_type ) );
        description += info;

[10.3840793]

[10.3841313]

        description << std::setfill('0');
        description << "base: " << static_cast<int>(item.base_type)
                    << " sub: " << static_cast<int>(item.sub_type)
                    << " plus: " << item.plus << " plus2: " << item.plus2
                    << " special: " << item.special
                    << "$"
                    << "quant: " << item.quantity
                    << " colour: " << static_cast<int>(item.colour)
                    << " flags: " << std::hex << std::setw(8) << item.flags
                    << std::dec << "$"
                    << "x: " << item.x << " y: " << item.y
                    << " link: " << item.link
                    << "$"
                    << "ident_type: "
                    << get_ident_type(item.base_type, item.sub_type)
                    << "$";

Replacement in crawl-ref/source/describe.cc at line 3282 [10.3736416]
B:BD[10.3841383] → [10.3841383:3841440]
```
        description += describe_weapon( item, verbose );
```
[10.3841383]
[10.3841440]
```
        description << describe_weapon( item, verbose );
```
Replacement in crawl-ref/source/describe.cc at line 3285 [10.3736416]
B:BD[10.3841478] → [10.3841478:3841524]
```
        description += describe_ammo( item );
```
[10.3841478]
[10.3841524]
```
        description << describe_ammo( item );
```
Replacement in crawl-ref/source/describe.cc at line 3288 [10.3736416]
B:BD[10.3841560] → [10.3841560:3841617]
```
        description += describe_armour( item, verbose );
```
[10.3841560]
[10.3841617]
```
        description << describe_armour( item, verbose );
```
Replacement in crawl-ref/source/describe.cc at line 3291 [10.3736416]
B:BD[10.3841652] → [10.3841652:3841699]
```
        description += describe_stick( item );
```
[10.3841652]
[10.3841699]
```
        description << describe_stick( item );
```
Replacement in crawl-ref/source/describe.cc at line 3294 [10.3736416]
B:BD[10.3841733] → [10.3841733:3841779]
```
        description += describe_food( item );
```
[10.3841733]
[10.3841779]
```
        description << describe_food( item );
```
Replacement in crawl-ref/source/describe.cc at line 3297 [10.3736416]
B:BD[10.3841816] → [10.3841816:3841864]
```
        description += describe_scroll( item );
```
[10.3841816]
[10.3841864]
```
        description << describe_scroll( item );
```

Replacement in crawl-ref/source/describe.cc at line 3300 [10.3736416]

B:BD[10.3841903] → [10.3841903:3841963]

        description += describe_jewellery( item, verbose );

[10.3841903]

[10.3841963]

        description << describe_jewellery( item, verbose );

Replacement in crawl-ref/source/describe.cc at line 3303 [10.3736416]
B:BD[10.3842000] → [10.3842000:3842048]
```
        description += describe_potion( item );
```
[10.3842000]
[10.3842048]
```
        description << describe_potion( item );
```
Replacement in crawl-ref/source/describe.cc at line 3306 [10.3736416]
B:BD[10.3842084] → [10.3842084:3842131]
```
        description += describe_staff( item );
```
[10.3842084]
[10.3842131]
```
        description << describe_staff( item );
```

Replacement in crawl-ref/source/describe.cc at line 3313 [10.3736416]

B:BD[10.3842239] → [10.3842239:3842314]

            description += "An extremely powerful but unpredictable book "

[10.3842239]

[10.3842314]

            description << "An extremely powerful but unpredictable book "

Replacement in crawl-ref/source/describe.cc at line 3318 [10.3736416]

B:BD[10.3842390] → [10.3842390:3842612]

            description += "A valuable book of magic which allows one to "
                "practise a certain skill greatly. As it is used, it gradually "
                "disintegrates and will eventually fall apart. ";

[10.3842390]

[10.3842612]

            description << "A valuable book of magic which allows one to "
                "practise a certain skill greatly. As it is used, it "
                "gradually disintegrates and will eventually fall apart. ";

Replacement in crawl-ref/source/describe.cc at line 3324 [10.3736416]

B:BD[10.3842649] → [10.3842649:3842727]

            description += "A book of magic spells. Beware, for some of the "

[10.3842649]

[10.3842727]

            description << "A book of magic spells. Beware, for some of the "

Replacement in crawl-ref/source/describe.cc at line 3331 [10.3736416]

B:BD[10.3842861] → [10.3842861:3842929]

        description += "Once you have escaped to the surface with "

[10.3842861]

[10.3842929]

        description << "Once you have escaped to the surface with "

Replacement in crawl-ref/source/describe.cc at line 3336 [10.3736416]
B:BD[10.3843036] → [10.3843036:3843087]
```
        description += describe_misc_item( item );
```
[10.3843036]
[10.3843087]
```
        description << describe_misc_item( item );
```

Replacement in crawl-ref/source/describe.cc at line 3340 [10.3736416]

B:BD[10.3843125] → [10.3843125:3843275]

        description +=
            ((item.sub_type == CORPSE_BODY) ? "A corpse. "
                                        : "A decaying skeleton. ");

[10.3843125]

[10.3843275]

        if ( item.sub_type == CORPSE_BODY)
            description << "A corpse. ";
        else
            description << "A decaying skeleton. ";

Replacement in crawl-ref/source/describe.cc at line 3347 [10.3736416]

B:BD[9.1002] → [9.1002:1062]

        description += "A pile of glittering gold coins. ";

[9.1002]

[9.1062]

        description << "A pile of glittering gold coins. ";

Replacement in crawl-ref/source/describe.cc at line 3352 [10.3736416]

B:BD[10.3843340] → [10.3843340:3843411]

        description += "This item should not exist. Mayday! Mayday! ";

[10.3843340]

[10.3843411]

        description << "This item should not exist. Mayday! Mayday! ";

Deletion in crawl-ref/source/describe.cc at line 3357 [10.3736416]
B:BD[10.3843446] → [22.220:221]
∅:D[22.221] → [10.3843446:3843492]
B:BD[10.3843446] → [10.3843446:3843492]
```
        description += "$It weighs around ";
```

Insertion in crawl-ref/source/describe.cc at line 3358 [10.3736416]

[11.987701]

[10.3843536]

        description << "$It weighs around " << (mass / 10)
                    << "." << (mass % 10)
                    << " aum. "; // arbitrary unit of mass

Deletion in crawl-ref/source/describe.cc at line 3362 [10.3736416]

B:BD[10.3843537] → [10.3843537:3843665]

B:BD[10.3843665] → [11.987702:987737]

∅:D[11.987737] → [10.3843703:3843805]

B:BD[10.3843703] → [10.3843703:3843805]

B:BD[10.3843805] → [11.987738:987774]

∅:D[11.987774] → [10.3843844:3843992]

B:BD[10.3843844] → [10.3843844:3843992]

B:BD[10.3843992] → [22.222:223]

        char item_mass[16];
        itoa( mass / 10, item_mass, 10 ); 
        
        for (int i = 0; i < 14; i++) 
        {
            if (item_mass[i] == 0)
            {
                item_mass[i] = '.';
                item_mass[i+1] = (mass % 10) + '0';
                item_mass[i+2] = 0;
                break;
            }
        }
        description += item_mass;
        description += " aum. ";        // arbitrary unit of mass

Replacement in crawl-ref/source/describe.cc at line 3365 [10.3736416]

B:BD[4.251] → [4.251:327]

                description += "$$This ancient artifact cannot be changed "

[4.251]

[4.327]

                description << "$$This ancient artifact cannot be changed "

Replacement in crawl-ref/source/describe.cc at line 3368 [10.3736416]

B:BD[4.394] → [4.394:457]

                description += "$$It is an ancient artifact.";

[4.394]

[4.457]

                description << "$$It is an ancient artifact.";

Replacement in crawl-ref/source/describe.cc at line 3372 [10.3736416]
B:BD[10.3843999] → [10.3843999:3844025]
```
    return (description);
```
[10.3843999]
[10.3844025]
```
    return description.str();
```
Deletion in crawl-ref/source/chardump.cc at line 566 [10.4100336]
B:BD[13.545756] → [13.545756:545795]
```
extern char id[4][50];  // itemname.cc
```
Replacement in crawl-ref/source/chardump.cc at line 613 [10.4100336]
B:BD[13.547218] → [13.547218:547265]
```
        value = item_value( item, id, false );
```
[13.547218]
[13.547265]
```
        value = item_value( item, false );
```
Deletion in crawl-ref/source/chardump.cc at line 626 [10.4100336]
B:BD[10.4111452] → [10.4111452:4111477]
```
    char temp_id[4][50];
```

Deletion in crawl-ref/source/chardump.cc at line 629 [10.4100336]

B:BD[10.4111502] → [10.4111502:4111627]

    for (i = 0; i < 4; i++)
    {
        for (j = 0; j < 50; j++)
        {
            temp_id[i][j] = 1;
        }
    }

Replacement in crawl-ref/source/chardump.cc at line 697 [10.4100336]

B:BD[10.4113888] → [13.547347:547469]

                            itoa( ival = 
                                      item_value( you.inv[j], temp_id, true ),

[10.4113888]

[10.4113964]

                            itoa( ival = item_value( you.inv[j], true ),

Insertion in crawl-ref/source/acr.cc at line 58 [10.4397395]
[10.4399683]
[10.4399683]
```
#include <sstream>
```

Replacement in crawl-ref/source/acr.cc at line 313 [10.4397395]

B:BD[7.1994] → [7.1994:2109]

∅:D[7.2109] → [23.89117:89146]

B:BD[23.89117] → [23.89117:89146]

            char ch = 'x';    
            mpr("Press any key to start the tutorial intro, or Escape to skip it.",
            MSGCH_TUTORIAL);

[7.1994]

[7.2110]

            int ch = 'x';    
            mpr("Press any key to start the tutorial intro, "
                "or Escape to skip it.", MSGCH_TUTORIAL);

Replacement in crawl-ref/source/acr.cc at line 317 [10.4397395]
∅:D[7.2138] → [23.89170:89179]
B:BD[23.89170] → [23.89170:89179]
```
        
```
[7.2138]
[7.2139]
Replacement in crawl-ref/source/acr.cc at line 320 [10.4397395]
B:BD[7.2208] → [7.2208:2222]
```
        }    
```
[7.2208]
[7.2222]
```
        }
```

Replacement in crawl-ref/source/acr.cc at line 322 [10.4397395]

∅:D[7.2223] → [24.216:728]

B:BD[24.216] → [24.216:728]

        snprintf(info, INFO_SIZE,
                 "%s, the %s %s, began the quest for the Orb.",
                 you.your_name,
                 species_name(you.species,you.experience_level),
                 you.class_name);                 
        take_note(Note(NOTE_USER_NOTE, 0, 0, info));
        snprintf(info, INFO_SIZE, "HP: %d/%d MP: %d/%d",
                 you.hp, you.hp_max, you.magic_points, you.max_magic_points);
        take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0, info));

[7.2223]

[24.728]

        std::ostringstream notestr;
        notestr << you.your_name << ", the "
                << species_name(you.species,you.experience_level) << " "
                << you.class_name
                << ", began the quest for the Orb.";
        take_note(Note(NOTE_USER_NOTE, 0, 0, notestr.str().c_str()));
        notestr.str("");
        notestr.clear();
        notestr << "HP: " << you.hp << "/" << you.hp_max
                << " MP: " << you.magic_points << "/" << you.max_magic_points;
        take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0,
                       notestr.str().c_str()));

Replacement in crawl-ref/source/acr.cc at line 2824 [10.4397395]
B:BD[11.1279942] → [11.1279942:1279992]
```
    clear_ids();                // in itemname.cc
```
[13.552506]
[2.187]
```
    get_typeid_array().init(ID_UNKNOWN_TYPE);
```

Deletion in crawl-ref/source/FixVec.h at line 61 [10.4566695]

B:BD[10.4568546] → [10.4568546:4568686]


// public:
//                        FixedVector(const FixedVector& rhs);
//
//            FixedVector& operator=(const FixedVector& rhs);

Replacement in crawl-ref/source/FixVec.h at line 66 [10.4566695]

B:BD[10.4568746] → [11.1285550:1285715]

// ----- Size -----
    bool        empty() const                          {return SIZE == 0;}
    size_t      size() const                           {return SIZE;}

[10.4568746]

[10.4568931]

    // ----- Size -----
    bool empty() const { return SIZE == 0; }
    size_t size() const { return SIZE; }

Replacement in crawl-ref/source/FixVec.h at line 70 [10.4566695]

B:BD[10.4568932] → [11.1285716:1286131]

// ----- Access -----
    TYPE&       operator[](unsigned long index)        {ASSERT(index < SIZE); return mData[index];}
    const TYPE& operator[](unsigned long index) const  {ASSERT(index < SIZE); return mData[index];}
        
    TYPE&       front()                                {ASSERT(SIZE > 0); return mData[0];}
    const TYPE& front() const                          {ASSERT(SIZE > 0); return mData[0];}

[10.4568932]

[10.4569387]

    // ----- Access -----
    TYPE& operator[](unsigned long index) {
        ASSERT(index < SIZE);
        return mData[index];
    }

Replacement in crawl-ref/source/FixVec.h at line 76 [10.4566695]

B:BD[10.4569388] → [11.1286132:1286477]

    TYPE&       back()                                 {ASSERT(SIZE > 0); return mData[SIZE - 1];}
    const TYPE& back() const                           {ASSERT(SIZE > 0); return mData[SIZE - 1];}
    
    TYPE*       buffer()                               {return mData;}
    const TYPE* buffer() const                         {return mData;}

[10.4569388]

[10.4569773]

    const TYPE& operator[](unsigned long index) const {
        ASSERT(index < SIZE);
        return mData[index];
    }

Replacement in crawl-ref/source/FixVec.h at line 81 [10.4566695]

B:BD[10.4569774] → [11.1286478:1286645]

// ----- Iterating -----
    iterator                 begin()                   {return mData;}
    const_iterator           begin() const             {return mData;}

[10.4569774]

[10.4569961]

    const TYPE* buffer() const { return mData; }
    TYPE* buffer() { return mData; }

Replacement in crawl-ref/source/FixVec.h at line 84 [10.4566695]

B:BD[10.4569962] → [11.1286646:1286834]

    iterator                 end()                     {return this->begin() + this->size();}
    const_iterator           end() const               {return this->begin() + this->size();}

[10.4569962]

[10.4570166]

    // ----- Iterating -----
    iterator begin() { return mData; }
    const_iterator begin() const { return mData; }

Replacement in crawl-ref/source/FixVec.h at line 88 [10.4566695]

B:BD[10.4570167] → [11.1286835:1286880]

    void                     init(TYPE def);

[10.4570167]

[10.4570620]

    iterator end() { return this->begin() + this->size(); }
    const_iterator end() const { return this->begin() + this->size(); }
    void init(const TYPE& def);

Replacement in crawl-ref/source/FixVec.h at line 122 [10.4566695]
B:BD[11.1287201] → [11.1287201:1287246]
```
void FixedVector<TYPE, SIZE>::init(TYPE def)
```
[11.1287201]
[11.1287246]
```
void FixedVector<TYPE, SIZE>::init(const TYPE& def)
```

Replacement in crawl-ref/source/FixAry.h at line 37 [10.4571383]

B:BD[10.4572278] → [10.4572278:4572445]

    typedef FixedVector<TYPE, HEIGHT> Column;  // operator[] needs to return one of these to avoid breaking client code (if inlining is on there won't be a speed hit)

[10.4572278]

[10.4572445]

    // operator[] should return one of these to avoid breaking
    // client code (if inlining is on there won't be a speed hit)
    typedef FixedVector<TYPE, HEIGHT> Column;

Deletion in crawl-ref/source/FixAry.h at line 41 [10.4571383]

B:BD[10.4572450] → [10.4572450:4572696]

//-----------------------------------
//    Initialization/Destruction
//
public:
                        ~FixedArray()                           {}
                            
                        FixedArray()                            {}

Replacement in crawl-ref/source/FixAry.h at line 46 [10.4571383]

B:BD[10.4572931] → [10.4572931:4573124]

            bool        empty() const                              {return WIDTH == 0 || HEIGHT == 0;}
            int         size() const                               {return WIDTH*HEIGHT;}

[10.4572931]

[10.4573124]

    bool empty() const { return WIDTH == 0 || HEIGHT == 0; }
    int size() const { return WIDTH*HEIGHT; }
    int width() const { return WIDTH; }
    int height() const { return HEIGHT; }

Deletion in crawl-ref/source/FixAry.h at line 51 [10.4571383]

B:BD[10.4573125] → [10.4573125:4573317]

            int         width() const                              {return WIDTH;}
            int         height() const                             {return HEIGHT;}

Replacement in crawl-ref/source/FixAry.h at line 52 [10.4571383]

B:BD[10.4573343] → [10.4573343:4573527]

B:BD[10.4573527] → [25.159703:159844]

            Column&       operator[](unsigned long index)          {return mData[index];}    
            const Column& operator[](unsigned long index) const    {return mData[index];}
            template<class Indexer> TYPE& operator () (const Indexer &i)
            {
                return mData[i.x][i.y];
            }

[10.4573343]

[25.159844]

    Column& operator[](unsigned long index) { return mData[index]; }
    const Column& operator[](unsigned long index) const {
        return mData[index];
    }
    template<class Indexer> TYPE& operator () (const Indexer &i) {
        return mData[i.x][i.y];
    }
    template<class Indexer> const TYPE& operator () (const Indexer &i) const {
        return mData[i.x][i.y];
    }
    
    void init(const TYPE& def) {
        for ( int i = 0; i < WIDTH; ++i )
            mData[i].init(def);
    }

Deletion in crawl-ref/source/FixAry.h at line 70 [10.4571383]

B:BD[25.159845] → [25.159845:160026]

∅:D[25.160026] → [10.4573527:4573599]

B:BD[10.4573527] → [10.4573527:4573599]

            template<class Indexer> const TYPE& operator () (const Indexer &i)
                const
            {
                return mData[i.x][i.y];
            }            
            
//-----------------------------------
//    Member Data
//

Replacement in crawl-ref/source/FixAry.h at line 71 [10.4571383]
B:BD[10.4573610] → [10.4573610:4573651]
```
    FixedVector<Column, WIDTH>    mData;
```
[10.4573610]
[10.4573651]
```
    FixedVector<Column, WIDTH> mData;
```

Cleaned up shop-handling code considerably.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tags.cc at line 870 [10.164589]

Replacement in crawl-ref/source/tags.cc at line 872 [10.164589]

Replacement in crawl-ref/source/tags.cc at line 874 [10.164589]

Replacement in crawl-ref/source/tags.cc at line 876 [10.164589]

Deletion in crawl-ref/source/tags.cc at line 880 [10.164589]

Replacement in crawl-ref/source/tags.cc at line 1194 [10.164589]

Replacement in crawl-ref/source/stash.h at line 143 [13.138156]

Deletion in crawl-ref/source/stash.h at line 151 [13.138156]

Deletion in crawl-ref/source/stash.cc at line 636 [13.147324]

Deletion in crawl-ref/source/stash.cc at line 638 [13.147324]

Replacement in crawl-ref/source/stash.cc at line 649 [13.147324]

Replacement in crawl-ref/source/stash.cc at line 658 [13.147324]

Replacement in crawl-ref/source/stash.cc at line 665 [13.147324]

Replacement in crawl-ref/source/stash.cc at line 673 [13.147324]

Replacement in crawl-ref/source/stash.cc at line 688 [13.147324]

Deletion in crawl-ref/source/stash.cc at line 698 [13.147324]

Deletion in crawl-ref/source/stash.cc at line 757 [13.147324]

Deletion in crawl-ref/source/stash.cc at line 807 [13.147324]

Deletion in crawl-ref/source/shopping.h at line 20 [10.758673]

Deletion in crawl-ref/source/shopping.h at line 21 [10.758673]

Replacement in crawl-ref/source/shopping.h at line 24 [10.758673]

Replacement in crawl-ref/source/shopping.h at line 35 [10.758673]

Deletion in crawl-ref/source/shopping.h at line 37 [10.758673]

Replacement in crawl-ref/source/shopping.cc at line 43 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 109 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 111 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 115 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 119 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 125 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 127 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 135 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 136 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 138 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 151 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 155 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 167 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 173 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 188 [10.759950]

Insertion in crawl-ref/source/shopping.cc at line 190 [10.759950]

Insertion in crawl-ref/source/shopping.cc at line 197 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 234 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 235 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 268 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 269 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 292 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 304 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 319 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 322 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 323 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 325 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 327 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 333 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 335 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 343 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 494 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1054 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1067 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1136 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1247 [10.759950]

Insertion in crawl-ref/source/shopping.cc at line 1250 [10.759950]

Insertion in crawl-ref/source/shopping.cc at line 1303 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 1307 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1310 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1404 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1409 [10.759950]

Deletion in crawl-ref/source/shopping.cc at line 1469 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1470 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1506 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1508 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1518 [10.759950]

Replacement in crawl-ref/source/shopping.cc at line 1522 [10.759950]

Replacement in crawl-ref/source/religion.cc at line 2502 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 2511 [10.804403]

Replacement in crawl-ref/source/itemprop.cc at line 401 [11.646661]

Replacement in crawl-ref/source/itemprop.cc at line 463 [11.646661]

Deletion in crawl-ref/source/itemname.h at line 20 [10.2661173]