fiddlerwoaroof/crawl - Change 4QREXSE4IVMKT2SF6MAKIGYBHU276HR7L32L7KAQZQMDQ3KHGD7QC

[2455904] Improving on-screen inventory by clarifying how many inventory slots the character has. Extra rows are filled up with ground items. Extra columns (after ENDOFPACK, but prior to full rows of ground items) are darkened out.

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

Created by ennewalker on December 24, 2008

4QREXSE4IVMKT2SF6MAKIGYBHU276HR7L32L7KAQZQMDQ3KHGD7QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilesdl.cc at line 1182 [3.19415]

B:BD[3.40645] → [4.339:441]

    const unsigned int mx = m_region_self_inv->mx;
    const unsigned int my = m_region_self_inv->my;

[3.40645]

[3.40705]

    const int mx = m_region_self_inv->mx;
    const int my = m_region_self_inv->my;

Replacement in crawl-ref/source/tilesdl.cc at line 1185 [3.19415]

B:BD[3.40706] → [4.442:551]

    unsigned int max_pack_row = (ENDOFPACK-1) / mx + 1;
    unsigned int max_pack_items = max_pack_row * mx;

[3.40706]

[3.40821]

    int max_pack_row = (ENDOFPACK-1) / mx + 1;
    int max_pack_items = max_pack_row * mx;

Replacement in crawl-ref/source/tilesdl.cc at line 1188 [3.19415]
B:BD[3.40822] → [4.552:585]
```
    unsigned int num_ground = 0;
```
[3.40822]
[4.585]
```
    int num_ground = 0;
```

Replacement in crawl-ref/source/tilesdl.cc at line 1193 [3.19415]

B:BD[4.745] → [4.745:801]

    unsigned int min_ground = std::min(num_ground, mx);

[4.745]

[4.801]

    int min_ground = std::min(num_ground, mx);

Insertion in crawl-ref/source/tilesdl.cc at line 1195 [3.19415]
[4.870]
[5.6135]
```
    max_pack_items = std::min(ENDOFPACK, max_pack_items);
```
Replacement in crawl-ref/source/tilesdl.cc at line 1238 [3.19415]
B:BD[3.42050] → [4.942:981]
```
    int remaining = mx*my- inv.size();
```
[3.42050]
[4.981]
```
    int remaining = mx*my - inv.size();
```

Replacement in crawl-ref/source/tilesdl.cc at line 1244 [3.19415]

B:BD[3.42458] → [4.1106:1167]

        if ((int)num_ground > remaining - empty_on_this_row)

[3.42458]

[4.1167]

        if (num_ground > remaining - empty_on_this_row)

Insertion in crawl-ref/source/tilesdl.cc at line 1251 [3.19415]

[4.1359]

                if (inv.size() >= max_pack_items)
                    desc.flag |= TILEI_FLAG_INVALID;

Insertion in crawl-ref/source/tilesdl.cc at line 1262 [3.19415]

[4.1571]

                if (inv.size() >= max_pack_items)
                    desc.flag |= TILEI_FLAG_INVALID;

Replacement in crawl-ref/source/tilesdl.cc at line 1269 [3.19415]

∅:D[6.1166] → [4.1705:1769]

B:BD[4.1705] → [4.1705:1769]

                std::max(((int)num_ground-1) / (int)mx + 1, 1);

[6.1166]

[4.1769]

                std::max((num_ground-1) / mx + 1, 1);

Replacement in crawl-ref/source/tilesdl.cc at line 1271 [3.19415]

B:BD[4.1770] → [4.1770:1825]

            while (inv.size() / mx + ground_rows < my)

[4.1770]

[4.1825]

            while (inv.size() / mx + ground_rows < my
                   && inv.size() < max_pack_items)

Insertion in crawl-ref/source/tilesdl.cc at line 1277 [3.19415]

[4.1951]

                    if (inv.size() >= max_pack_items)
                        desc.flag |= TILEI_FLAG_INVALID;

Replacement in crawl-ref/source/tiles.h at line 176 [7.7013]

B:BD[3.45310] → [3.45310:45470]

B:BD[3.45470] → [2.1712:1775]

    TILEI_FLAG_SELECT = 0x0100,
    TILEI_FLAG_TRIED  = 0x0200,
    TILEI_FLAG_EQUIP  = 0x0400,
    TILEI_FLAG_FLOOR  = 0x0800,
    TILEI_FLAG_CURSE  = 0x1000,
    TILEI_FLAG_CURSOR = 0x2000,
    TILEI_FLAG_MELDED = 0x4000

[3.45310]

[3.45501]

    TILEI_FLAG_SELECT  = 0x0100,
    TILEI_FLAG_TRIED   = 0x0200,
    TILEI_FLAG_EQUIP   = 0x0400,
    TILEI_FLAG_FLOOR   = 0x0800,
    TILEI_FLAG_CURSE   = 0x1000,
    TILEI_FLAG_CURSOR  = 0x2000,
    TILEI_FLAG_MELDED  = 0x4000,
    TILEI_FLAG_INVALID = 0x8000

Insertion in crawl-ref/source/tilereg.cc at line 1341 [3.54399]

[8.632]

[3.93930]


            if (item.flag & TILEI_FLAG_INVALID)
                add_quad(TEX_DEFAULT, TILE_MESH, x, y);