fiddlerwoaroof/crawl - Change AXQJOPTECRU3ECV3ICDUR6SGBIOIZT5HIOSJ77MRLF5ECGOITMDQC

[1603676] Stairs override items on the same square for display purposes if

stair_item_brand is set (defaults to reverse).

Fixed compile error in clua.cc (oops).

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

Created by dshaligram on June 1, 2007

AXQJOPTECRU3ECV3ICDUR6SGBIOIZT5HIOSJ77MRLF5ECGOITMDQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 241 [5.16817]

[4.5546]

[5.29991]

    case COLFLAG_STAIR_ITEM:
        return (Options.stair_item_brand);

Replacement in crawl-ref/source/view.cc at line 303 [5.16817]

B:BD[4.6801] → [4.6801:6846]

        if (Feature[object].colour != BLACK)

[4.6801]

[4.6846]

        if (!*colour && Feature[object].colour != BLACK)

Replacement in crawl-ref/source/view.cc at line 455 [5.16817]
∅:D[6.5631] → [5.37092:37093]
∅:D[4.8319] → [5.37092:37093]
B:BD[5.37092] → [5.37092:37093]
[4.8319]
[4.8320]
```
    
```

Insertion in crawl-ref/source/view.cc at line 480 [5.16817]

[4.9011]

[5.38488]


    if (Options.stair_item_brand
        && is_stair(grid_value) && igrd[x + 1][y + 1] != NON_ITEM)
    {
        tc |= COLFLAG_STAIR_ITEM;
    }

Deletion in crawl-ref/source/view.cc at line 837 [5.16817]

∅:D[4.12192] → [6.13075:13277]

B:BD[6.13075] → [6.13075:13277]

                        
                        ecol = (grd[count_x][count_y] == DNGN_SHALLOW_WATER)?
                                        CYAN
                                      : eitem.colour;

Replacement in crawl-ref/source/view.cc at line 838 [5.16817]

B:BD[6.13301] → [6.13301:13353]

                        if (eitem.link != NON_ITEM)

[6.13278]

[5.49914]

                        const int grid = grd[count_x][count_y];
                        if (Options.stair_item_brand && is_stair(grid))
                            ecol |= COLFLAG_STAIR_ITEM;
                        else

Replacement in crawl-ref/source/view.cc at line 843 [5.16817]

B:BD[5.49940] → [6.13354:13409]

                            ecol |= COLFLAG_ITEM_HEAP;

[5.49940]

[5.50147]

                            ecol = (grid == DNGN_SHALLOW_WATER)?
                                CYAN
                                : eitem.colour;
                            if (eitem.link != NON_ITEM)
                            {
                                ecol |= COLFLAG_ITEM_HEAP;
                            }
                            env.show[ix][iy] = get_item_dngn_code( eitem );

Deletion in crawl-ref/source/view.cc at line 853 [5.16817]

B:BD[5.50173] → [4.12193:12265]

                        env.show[ix][iy] = get_item_dngn_code( eitem );

Replacement in crawl-ref/source/libunix.cc at line 503 [5.2550041]

B:BD[6.340932] → [6.340932:341214]

B:BD[6.341214] → [4.630458:630523]

∅:D[4.630523] → [6.341214:341281]

B:BD[6.341214] → [6.341214:341281]

    return (col & COLFLAG_FRIENDLY_MONSTER)?    Options.friend_brand :
           (col & COLFLAG_ITEM_HEAP)?           Options.heap_brand :
           (col & COLFLAG_WILLSTAB)?            Options.stab_brand :
           (col & COLFLAG_MAYSTAB)?             Options.may_stab_brand :
           (col & COLFLAG_REVERSE)?             CHATTR_REVERSE :
                                                CHATTR_NORMAL;

[6.340932]

[6.341281]

    return (col & COLFLAG_FRIENDLY_MONSTER)? Options.friend_brand :
        (col & COLFLAG_ITEM_HEAP)?           Options.heap_brand :
        (col & COLFLAG_WILLSTAB)?            Options.stab_brand :
        (col & COLFLAG_MAYSTAB)?             Options.may_stab_brand :
        (col & COLFLAG_STAIR_ITEM)?          Options.stair_item_brand :
        (col & COLFLAG_REVERSE)?             CHATTR_REVERSE :
                                             CHATTR_NORMAL;

Replacement in crawl-ref/source/initfile.cc at line 717 [5.2957258]

B:BD[5.2966084] → [4.795063:795211]

B:BD[4.795211] → [2.144:172]

    friend_brand    = CHATTR_NORMAL;
    heap_brand      = CHATTR_NORMAL;
    stab_brand      = CHATTR_NORMAL;
    may_stab_brand  = CHATTR_NORMAL;
    no_dark_brand   = true;

[5.2966084]

[5.2966188]

    friend_brand     = CHATTR_NORMAL;
    heap_brand       = CHATTR_NORMAL;
    stab_brand       = CHATTR_NORMAL;
    may_stab_brand   = CHATTR_NORMAL;
    stair_item_brand = CHATTR_REVERSE;
    
    no_dark_brand    = true;

Insertion in crawl-ref/source/initfile.cc at line 1660 [5.2957258]

[4.802359]

[6.411485]

    }
    else if (key == "stair_item_brand")
    {
        stair_item_brand = curses_attribute(field);

Replacement in crawl-ref/source/externs.h at line 1417 [5.3270163]

B:BD[6.444733] → [6.444733:444957]

    unsigned    heap_brand;     // Highlight heaps of items in the playing area
    unsigned    stab_brand;     // Highlight monsters that are stabbable
    unsigned    may_stab_brand; // Highlight potential stab candidates

[6.444733]

[6.444957]

    unsigned    heap_brand;       // Highlight heaps of items
    unsigned    stab_brand;       // Highlight monsters that are stabbable
    unsigned    may_stab_brand;   // Highlight potential stab candidates
    unsigned    stair_item_brand; // Highlight stairs covered by items.

Replacement in crawl-ref/source/defines.h at line 269 [5.3982910]

B:BD[6.478396] → [4.1023109:1023162]


    #define COLFLAG_REVERSE                  0x1000

[6.478396]

[5.3986158]

    #define COLFLAG_STAIR_ITEM               0x1000
    #define COLFLAG_REVERSE                  0x2000

Insertion in crawl-ref/source/clua.cc at line 27 [6.483969]
[6.484364]
[6.484364]
```
#include "religion.h"
```
Insertion in crawl-ref/init.txt at line 106 [5.4830895]
[7.3484]
[8.4310]
```
# stair_item_brand = reverse
```

Replacement in crawl-ref/docs/crawl_options.txt at line 33 [7.63392]

B:BD[3.4106] → [3.4106:4176]

                heap_brand, friend_brand, stab_brand, may_stab_brand

[3.4106]

[3.4176]

                heap_brand, friend_brand, stab_brand, may_stab_brand,
                stair_item_brand

Replacement in crawl-ref/docs/crawl_options.txt at line 415 [7.63392]

B:BD[9.17328] → [9.17328:17569]

Branding refers to displaying particular monsters (e.g. summons) or items in a 
special way; special as in reversing fore- and background. There are several 
branding choices (these will not work everywhere; it depends on OS and 
terminal):

[9.17328]

[9.17569]

Branding refers to displaying particular monsters (e.g. summons) or
items in a special way; special as in reversing fore- and background.
There are several branding choices (these will not work everywhere; it
depends on OS and terminal):

Deletion in crawl-ref/docs/crawl_options.txt at line 428 [7.63392]
B:BD[9.18140] → [9.18140:18184]
```
By default, there is no branding activated.
```
Replacement in crawl-ref/docs/crawl_options.txt at line 429 [7.63392]
B:BD[9.18185] → [9.18185:18196]
```
heap_brand
```
[9.18185]
[3.12542]
```
By default, no brands are active apart from stair_item_brand.
heap_brand = none
```
Replacement in crawl-ref/docs/crawl_options.txt at line 435 [7.63392]
B:BD[9.18287] → [9.18287:18300]
```
friend_brand
```
[9.18287]
[3.12646]
```
friend_brand = none
```
Replacement in crawl-ref/docs/crawl_options.txt at line 441 [7.63392]
B:BD[9.18503] → [9.18503:18514]
```
stab_brand
```
[9.18503]
[3.12877]
```
stab_brand = none
```

Replacement in crawl-ref/docs/crawl_options.txt at line 450 [7.63392]

B:BD[9.18938] → [9.18938:18954]

B:BD[9.18954] → [3.13350:13654]

may_stab_brand 
        Stabbing may be possible even if the monster is not asleep (if it's 
        confused or distracted, for instance). This option brands monsters that
        you *might* be able to stab. Primarily useful for worshippers of The 
        Shining One. Purists may consider this unnecessarily spoily.

[9.18938]

[9.19230]

may_stab_brand = none
        Stabbing may be possible even if the monster is not asleep (if
        it's confused or distracted, for instance). This option brands
        monsters that you *might* be able to stab.
stair_item_brand = reverse
        Brands stairs that would otherwise be hidden by items. If you
        use this brand, the items on the square are hidden by the stair
        symbol (<, >, or portal) and the stair symbol is branded.