fiddlerwoaroof/crawl - Change GL7TJGUGV4JPLZCDWH6QVST4RYW7UJV6IP7UAEWEKNBWJO2H2ZHAC

FR 1938146: Suppress red colouring for blood spattered stairs.

And some more white space changes.

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

Created by j-p-e-g on April 11, 2008

GL7TJGUGV4JPLZCDWH6QVST4RYW7UJV6IP7UAEWEKNBWJO2H2ZHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 392 [6.16817]

B:BD[5.440] → [5.440:576]

    return (grid_altar_god(grid) == GOD_NO_GOD && !grid_is_trap(grid)
            && !grid_is_portal(grid) && grid != DNGN_ENTER_SHOP);

[5.440]

[7.369]

    // altars, stairs (of any kind) and traps should not be coloured red
    return (!is_critical_feature(grid) && !grid_is_trap(grid));

Replacement in crawl-ref/source/describe.cc at line 119 [6.3736416]
B:BD[6.3739767] → [8.557:566]
```
        
```
[6.3739767]
[8.566]
Replacement in crawl-ref/source/describe.cc at line 128 [6.3736416]
B:BD[8.934] → [8.934:965]
```
        }            
        
```
[8.934]
[6.3739768]
```
        }
```
Replacement in crawl-ref/source/describe.cc at line 197 [6.3736416]
∅:D[9.3676] → [10.4681:4686]
B:BD[10.4681] → [10.4681:4686]
```
    
```
[9.3676]
[10.4686]
Replacement in crawl-ref/source/describe.cc at line 261 [6.3736416]
B:BD[11.5260] → [2.2984:2997]
```
            
```
[11.5260]
[2.2997]
Replacement in crawl-ref/source/describe.cc at line 269 [6.3736416]
B:BD[2.3274] → [2.3274:3292]
```
                 
```
[2.3274]
[11.5284]
Replacement in crawl-ref/source/describe.cc at line 294 [6.3736416]
B:BD[12.773] → [2.3293:3310]
```
                
```
[12.773]
[2.3310]
Replacement in crawl-ref/source/describe.cc at line 474 [6.3736416]
B:BD[13.13126] → [13.13126:13131]
```
    
```
[13.13126]
[14.983224]
Replacement in crawl-ref/source/describe.cc at line 483 [6.3736416]
B:BD[13.13242] → [13.13242:13247]
```
    
```
[13.13242]
[15.1658]
Replacement in crawl-ref/source/describe.cc at line 511 [6.3736416]
B:BD[16.32889] → [16.32889:32894]
```
    
```
[16.32889]
[16.32895]
Replacement in crawl-ref/source/describe.cc at line 513 [6.3736416]
B:BD[16.32939] → [16.32939:32944]
```
    
```
[16.32939]
[12.4668]
Replacement in crawl-ref/source/describe.cc at line 628 [6.3736416]
∅:D[12.8379] → [6.3749098:3749103]
B:BD[6.3749098] → [6.3749098:3749103]
```
    
```
[12.8379]
[17.29116]
Replacement in crawl-ref/source/describe.cc at line 787 [6.3736416]
B:BD[6.3767499] → [3.4045:4050]
```
    
```
[6.3767499]
[6.3767524]

Replacement in crawl-ref/source/describe.cc at line 865 [6.3736416]

B:BD[14.984741] → [14.984741:984818]

                    description += " fired from it inflicts extra damage.";

[14.984741]

[14.984818]

                    description += " fired from it inflicts extra damage.";

Replacement in crawl-ref/source/describe.cc at line 1119 [6.3736416]
B:BD[18.5534] → [18.5534:5574]
```
        && item.sub_type != ARM_SHIELD 
```
[18.5534]
[18.5574]
```
        && item.sub_type != ARM_SHIELD
```
Replacement in crawl-ref/source/describe.cc at line 1217 [6.3736416]
∅:D[19.6647] → [6.3791682:3791724]
B:BD[6.3791682] → [6.3791682:3791724]
```
        switch (get_equip_race( item ))  
```
[19.6647]
[6.3791724]
```
        switch (get_equip_race( item ))
```
Replacement in crawl-ref/source/describe.cc at line 1233 [6.3736416]
B:BD[6.3792179] → [6.3792179:3792188]
```
        
```
[6.3792179]
[6.3792188]
Replacement in crawl-ref/source/describe.cc at line 1274 [6.3736416]
B:BD[6.3824205] → [6.3824205:3824233]
```
        if (item.plus != 0 
```
[6.3824205]
[6.3824233]
```
        if (item.plus != 0
```
Replacement in crawl-ref/source/describe.cc at line 1325 [6.3736416]
B:BD[6.3826113] → [6.3826113:3826126]
```
            
```
[6.3826113]
[6.3826126]
Replacement in crawl-ref/source/describe.cc at line 1469 [6.3736416]
B:BD[6.3839874] → [6.3839874:3839920]
```
    else if (item.base_type == OBJ_JEWELLERY 
```
[6.3839874]
[20.3858]
```
    else if (item.base_type == OBJ_JEWELLERY
```
Replacement in crawl-ref/source/describe.cc at line 1714 [6.3736416]
B:BD[21.23291] → [21.23291:23300]
```
        
```
[21.23285]
[22.5240]

Replacement in crawl-ref/source/describe.cc at line 1735 [6.3736416]

B:BD[23.475339] → [23.475339:475419]

        spellbook_contents( dup, 
                item.base_type == OBJ_BOOKS?

[23.475339]

[23.475419]

        spellbook_contents( dup,
                item.base_type == OBJ_BOOKS?

Replacement in crawl-ref/source/describe.cc at line 1738 [6.3736416]
B:BD[23.475456] → [23.475456:475494]
```
                  : RBOOK_USE_STAFF, 
```
[23.475456]
[23.475494]
```
                  : RBOOK_USE_STAFF,
```
Replacement in crawl-ref/source/describe.cc at line 1791 [6.3736416]
B:BD[24.2183] → [24.2183:2188]
```
    
```
[24.2183]
[4.40692]

Replacement in crawl-ref/source/describe.cc at line 1850 [6.3736416]

B:BD[10.7528] → [25.3717:3797]

                you.quiver_change = true;       // might have added/removed !F

[10.7528]

[25.3797]

                you.quiver_change = true;       // might have added/removed !F

Replacement in crawl-ref/source/describe.cc at line 1961 [6.3736416]
B:BD[26.3386] → [27.1960:1995]
```
    std::string description;      
```
[26.3386]
[26.3415]
```
    std::string description;
```
Replacement in crawl-ref/source/describe.cc at line 1985 [6.3736416]
B:BD[26.4324] → [26.4324:4329]
```
    
```
[26.4324]
[26.4329]
Replacement in crawl-ref/source/describe.cc at line 2019 [6.3736416]
B:BD[28.4904] → [28.4904:4909]
```
    
```
[28.4904]
[29.2648]
Replacement in crawl-ref/source/describe.cc at line 2022 [6.3736416]
∅:D[29.2744] → [30.38858:38929]
∅:D[31.3530] → [30.38858:38929]
∅:D[32.12683] → [30.38858:38929]
B:BD[6.3887188] → [30.38858:38929]
```
    
    // Note: Nearly all of the "long" descriptions have moved to 
```
[31.3530]
[30.38929]
```
    // Note: Nearly all of the "long" descriptions have moved to
```

Replacement in crawl-ref/source/describe.cc at line 2028 [6.3736416]

B:BD[30.39200] → [30.39200:39269]

    // sort of message to print (eg "It's beautiful" or "It's ugly"

[30.39200]

[30.39269]

    // sort of message to print (eg "It's beautiful" or "It's ugly"

Replacement in crawl-ref/source/describe.cc at line 2133 [6.3736416]
∅:D[26.4735] → [14.989996:990019]
∅:D[29.5260] → [14.989996:990019]
∅:D[22.5814] → [14.989996:990019]
B:BD[14.989996] → [14.989996:990019]
```
        break;        
```
[29.5260]
[14.990019]
```
        break;
```

Replacement in crawl-ref/source/describe.cc at line 2238 [6.3736416]

B:BD[23.476139] → [23.476139:476203]

    // of the ghost's species, not the player's stats... exact

[23.476139]

[29.6401]

    // of the ghost's species, not the player's stats... exact

Replacement in crawl-ref/source/describe.cc at line 2305 [6.3736416]
B:BD[33.7454] → [33.7454:7459]
```
    
```
[33.7454]
[29.7654]
Replacement in crawl-ref/source/describe.cc at line 2322 [6.3736416]
B:BD[33.7943] → [33.7943:7948]
```
    
```
[33.7943]
[29.8115]
Replacement in crawl-ref/source/describe.cc at line 2343 [6.3736416]
B:BD[6.3942697] → [34.54837:54889]
```
// Describes the player's standing with his deity. 
```
[6.3942697]
[6.3942806]
```
// Describes the player's standing with his deity.
```
Replacement in crawl-ref/source/describe.cc at line 2519 [6.3736416]
B:BD[6.3952270] → [6.3952270:3952292]
```
            default: 
```
[6.3952270]
[6.3952292]
```
            default:
```
Replacement in crawl-ref/source/describe.cc at line 2583 [6.3736416]
B:BD[35.9497] → [35.9497:9502]
```
    
```
[35.9497]
[35.9502]

FR 1938146: Suppress red colouring for blood spattered stairs.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 392 [6.16817]

Replacement in crawl-ref/source/describe.cc at line 119 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 128 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 197 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 261 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 269 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 294 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 474 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 483 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 511 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 513 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 628 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 787 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 865 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1119 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1217 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1233 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1274 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1325 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1469 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1714 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1735 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1738 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1791 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1850 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1961 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 1985 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2019 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2022 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2028 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2133 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2238 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2305 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2322 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2343 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2519 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2583 [6.3736416]