fiddlerwoaroof/crawl - Change J7GPW2YXLT6FGSKJ24FGQ24GTRZ6A2BDYM6CIXV4R6YBEHP6BGPAC

Change floor_property (blood, sanctuary) to flags, and add two new

settings: vault and highlight. Vault means a grid is part of a vault (set in dungeon.cc), and currently used to exempt vault grids when shifting labyrinths. Highlight is a meta flag currently only used to highlight labyrinth changes on the 'X' map in wizard mode, but I can think of a couple of other uses, mostly for debugging purposes.

Also replace a few for loops in the lab shift function with rectangle_iterators.

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

Created by j-p-e-g on November 7, 2008

J7GPW2YXLT6FGSKJ24FGQ24GTRZ6A2BDYM6CIXV4R6YBEHP6BGPAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.h at line 170 [10.13254]
B:BD[8.113] → [9.6:54]
```
void set_envmap_prop( int x, int y, int prop );
```
Deletion in crawl-ref/source/view.cc at line 199 [10.16817]
∅:D[11.2218] → [8.752:755]
B:BD[8.752] → [8.752:755]
B:BD[8.755] → [9.91:175]
```
}
void set_envmap_prop( int x, int y, int prop )
{
    env.map[x][y].property = prop;
```

Replacement in crawl-ref/source/view.cc at line 203 [10.16817]

B:BD[9.213] → [12.736:847]

    return (env.map(p).property == FPROP_SANCTUARY_1
            || env.map(p).property == FPROP_SANCTUARY_2);

[9.213]

[13.197]

    return (testbits(env.map(p).property, FPROP_SANCTUARY_1)
            || testbits(env.map(p).property, FPROP_SANCTUARY_2));

Replacement in crawl-ref/source/view.cc at line 209 [10.16817]

B:BD[13.237] → [12.890:940]

    return (env.map(p).property == FPROP_BLOODY);

[13.237]

[9.264]

    return (testbits(env.map(p).property, FPROP_BLOODY));

Replacement in crawl-ref/source/view.cc at line 445 [10.16817]

B:BD[9.389] → [14.1688:1754]

                if (env.map(where).property == FPROP_SANCTUARY_1)

[9.389]

[9.454]

                if (testbits(env.map(where).property, FPROP_SANCTUARY_1))

Replacement in crawl-ref/source/view.cc at line 447 [10.16817]

B:BD[9.502] → [14.1755:1826]

                else if (env.map(where).property == FPROP_SANCTUARY_2)

[9.502]

[9.572]

                else if (testbits(env.map(where).property, FPROP_SANCTUARY_2))

Insertion in crawl-ref/source/view.cc at line 640 [10.16817]

[15.336]

[5.425]

#ifdef WIZARD
    if (travel_colour && testbits(env.map(p).property, FPROP_HIGHLIGHT))
        return (LIGHTGREEN);
#endif

Deletion in crawl-ref/source/view.cc at line 4996 [10.16817]
B:BD[16.3912] → [16.3912:3934]
```
                    {
```
Replacement in crawl-ref/source/view.cc at line 4997 [10.16817]
∅:D[4.303] → [16.4068:4090]
B:BD[16.4068] → [16.4068:4090]
```
                    }
```
[4.303]
[17.1287]
Insertion in crawl-ref/source/terrain.cc at line 507 [19.26938]
[18.364]
[18.364]
```
// Um, what does this do? (jpeg)
```

Replacement in crawl-ref/source/terrain.cc at line 512 [19.26938]

B:BD[18.561] → [18.561:608]

    if (env.map(pos).property != FPROP_BLOODY)

[18.561]

[18.608]

    if (!testbits(env.map(pos).property, FPROP_BLOODY))

Replacement in crawl-ref/source/terrain.cc at line 520 [19.26938]

B:BD[18.826] → [18.826:874]

            env.map(pos).property = FPROP_NONE;

[18.826]

[18.874]

            env.map(pos).property &= ~(FPROP_BLOODY);

Replacement in crawl-ref/source/terrain.cc at line 528 [19.26938]

B:BD[18.1086] → [18.1086:1134]

            env.map(pos).property = FPROP_NONE;

[18.1086]

[18.1134]

            env.map(pos).property &= ~(FPROP_BLOODY);

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

B:BD[11.12221] → [9.1048:1115]

            marshallShort(th, env.map[count_x][count_y].property);

[11.12221]

[20.169]

            marshallLong(th, env.map[count_x][count_y].property);

Replacement in crawl-ref/source/tags.cc at line 1975 [10.164589]
∅:D[21.6692] → [9.1238:1296]
B:BD[11.12390] → [9.1238:1296]
```
            env.map[i][j].property = unmarshallShort(th);
```
[21.6692]
[10.208120]
```
            env.map[i][j].property = unmarshallLong(th);
```
Replacement in crawl-ref/source/stuff.cc at line 140 [10.224557]
B:BD[22.1610] → [22.1610:1639]
```
    if ( y_border_dist < 0 )
```
[22.1610]
[22.1639]
```
    if (y_border_dist < 0)
```
Insertion in crawl-ref/source/stuff.cc at line 142 [10.224557]
[22.1678]
[22.1678]

Replacement in crawl-ref/source/spells3.cc at line 1418 [10.531613]

B:BD[23.7238] → [24.849:926]

    // Teleporting in a labyrinth is also funny, but only for non-minotaurs.

[23.7238]

[24.926]

    // Teleporting in a labyrinth is also funny, more so for non-minotaurs.

Replacement in crawl-ref/source/spells3.cc at line 1420 [10.531613]

B:BD[24.943] → [24.943:1019]

        && (you.level_type == LEVEL_LABYRINTH && you.species != SP_MINOTAUR

[24.943]

[24.1019]

        && (you.level_type == LEVEL_LABYRINTH

Replacement in crawl-ref/source/spells3.cc at line 1423 [10.531613]

∅:D[23.7336] → [25.28619:28651]

B:BD[25.28619] → [25.28619:28651]

        xom_is_stimulated(255);

[23.7336]

[23.7337]

        if (you.level_type == LEVEL_LABYRINTH && you.species == SP_MINOTAUR)
            xom_is_stimulated(128);
        else
            xom_is_stimulated(255);

Insertion in crawl-ref/source/spells3.cc at line 1538 [10.531613]

[26.713]

[9.1713]

static void _remove_sanctuary_property(coord_def where)
{
    env.map(where).property &= ~(FPROP_SANCTUARY_1 | FPROP_SANCTUARY_2);
}

Replacement in crawl-ref/source/spells3.cc at line 1557 [10.531613]
B:BD[12.10130] → [12.10130:10178]
```
            env.map(*ri).property = FPROP_NONE;
```
[12.10130]
[12.10178]
```
            _remove_sanctuary_property(*ri);
```

Replacement in crawl-ref/source/spells3.cc at line 1563 [10.531613]

B:BD[9.2437] → [9.2437:2550]

//  do not reset so as to allow monsters to see if their fleeing source
//  used to be the centre of a sanctuary

[9.2437]

[27.1016]

//  Do not reset so as to allow monsters to see if their fleeing source
//  used to be the centre of a sanctuary. (jpeg)

Replacement in crawl-ref/source/spells3.cc at line 1614 [10.531613]

B:BD[28.9011] → [28.9011:9070]

                env.map[posx][posy].property = FPROP_NONE;

[28.9011]

[28.9070]

                _remove_sanctuary_property(coord_def(posx, posy));

Replacement in crawl-ref/source/spells3.cc at line 1620 [10.531613]

B:BD[27.2060] → [27.2060:2141]

        env.map[env.sanctuary_pos.x][env.sanctuary_pos.y].property = FPROP_NONE;

[27.2060]

[27.2141]

        _remove_sanctuary_property(coord_def(env.sanctuary_pos.x,
                                             env.sanctuary_pos.y));

Replacement in crawl-ref/source/spells3.cc at line 1671 [10.531613]

B:BD[14.26856] → [14.26856:26924]

        if (env.map(pos).property == FPROP_BLOODY && see_grid(pos))

[14.26856]

[14.26924]

        if (testbits(env.map(pos).property, FPROP_BLOODY) && see_grid(pos))

Replacement in crawl-ref/source/spells3.cc at line 1696 [10.531613]

B:BD[14.27862] → [14.27862:27927]

            env.map(pos).property = FPROP_SANCTUARY_1; // yellow

[14.27862]

[14.27927]

            env.map(pos).property |= FPROP_SANCTUARY_1; // yellow

Replacement in crawl-ref/source/spells3.cc at line 1699 [10.531613]

B:BD[14.27950] → [14.27950:28014]

            env.map(pos).property = FPROP_SANCTUARY_2; // white

[14.27950]

[3.551]

            env.map(pos).property |= FPROP_SANCTUARY_2; // white
        env.map(pos).property &= ~(FPROP_BLOODY);

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

B:BD[29.2677] → [2.3374:3449]

            for ( radius_iterator ri(you.pos(), 3, true, true); ri; ++ri )

[29.2677]

[2.3449]

            for (radius_iterator ri(you.pos(), 3, true, true); ri; ++ri)

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

B:BD[2.3491] → [2.3491:3547]

                    env.map(*ri).property = FPROP_NONE;

[2.3491]

[13.3901]

                    env.map(*ri).property &= ~(FPROP_BLOODY);

Replacement in crawl-ref/source/misc.cc at line 1108 [10.1933596]
B:BD[30.6090] → [12.37073:37120]
```
    if (env.map(where).property != FPROP_NONE)
```
[30.6090]
[13.5514]
```
    if (is_bloodcovered(where) || is_sanctuary(where))
```

Replacement in crawl-ref/source/misc.cc at line 1146 [10.1933596]

B:BD[12.37605] → [12.37605:37657]

            env.map(where).property = FPROP_BLOODY;

[12.37605]

[31.18615]

            env.map(where).property |= FPROP_BLOODY;

Replacement in crawl-ref/source/misc.cc at line 1149 [10.1933596]

B:BD[30.6317] → [12.37658:37711]

        if (env.map(where).property == FPROP_BLOODY)

[30.6317]

[12.37711]

        if (testbits(env.map(where).property, FPROP_BLOODY))

Replacement in crawl-ref/source/misc.cc at line 1194 [10.1933596]

B:BD[12.38704] → [22.7126:7176]

            env.map(*ai).property = FPROP_BLOODY;

[12.38704]

[22.7176]

            env.map(*ai).property |= FPROP_BLOODY;

Replacement in crawl-ref/source/misc.cc at line 1235 [10.1933596]

B:BD[12.38949] → [12.38949:38997]

            env.map(c).property = FPROP_BLOODY;

[12.38949]

[12.38997]

            env.map(c).property |= FPROP_BLOODY;

Insertion in crawl-ref/source/maps.cc at line 231 [10.2007666]
[32.586489]
[33.1055]
```
    {
```
Replacement in crawl-ref/source/maps.cc at line 233 [10.2007666]
∅:D[33.1087] → [10.2161878:2161879]
∅:D[32.586520] → [10.2161878:2161879]
B:BD[10.2161878] → [10.2161878:2161879]
[33.1087]
[34.12557]
```
    }
```
Insertion in crawl-ref/source/maps.cc at line 236 [10.2007666]
[32.586616]
[33.1088]
```
    {
```
Insertion in crawl-ref/source/maps.cc at line 238 [10.2007666]
[33.1119]
[10.2162022]
```
    }
```
Insertion in crawl-ref/source/maps.cc at line 245 [10.2007666]
[32.586876]
[33.1120]
```
    {
```
Replacement in crawl-ref/source/maps.cc at line 247 [10.2007666]
∅:D[33.1157] → [10.2169503:2169504]
∅:D[32.586912] → [10.2169503:2169504]
B:BD[10.2169503] → [10.2169503:2169504]
[33.1157]
[32.586913]
```
    }
```
Insertion in crawl-ref/source/maps.cc at line 251 [10.2007666]
[32.587036]
[33.1158]
```
    {
```
Insertion in crawl-ref/source/maps.cc at line 253 [10.2007666]
[33.1196]
[35.139354]
```
    }
```

Insertion in crawl-ref/source/maps.cc at line 287 [10.2007666]

[33.1790]

[32.587467]

//        for (unsigned int x = start.x; x < start.x + s.length(); x++)
//            env.map[x][y].property |= FPROP_VAULT;

Insertion in crawl-ref/source/files.cc at line 1136 [10.3084589]
[36.6385]
[36.6385]
```
        _clear_env_map();
```
Deletion in crawl-ref/source/files.cc at line 1194 [10.3084589]
∅:D[37.2775] → [10.3098295:3098296]
∅:D[8.3036] → [10.3098295:3098296]
∅:D[38.10234] → [10.3098295:3098296]
B:BD[10.3098295] → [10.3098295:3098296]
B:BD[10.3098296] → [38.10235:10263]
B:BD[38.10263] → [17.13136:13162]
```
    if (just_created_level)
        _clear_env_map();
```
Replacement in crawl-ref/source/externs.h at line 1410 [10.3270163]
B:BD[11.17605] → [9.16648:16677]
```
    unsigned short property;
```
[11.17605]
[8.3221]
```
    unsigned long property; // Flags for blood, sanctuary, ...
```
Replacement in crawl-ref/source/externs.h at line 1413 [10.3270163]
B:BD[9.16743] → [9.16743:16804]
```
    void clear() { flags = object = colour = property = 0; }
```
[9.16743]
[11.17708]
```
    void clear() { flags = object = colour = 0; }
```

Insertion in crawl-ref/source/enum.h at line 787 [10.3287960]

[39.107671]

};
enum feature_property_type
{
    FPROP_NONE = 0,
    FPROP_SANCTUARY_1 = (1 << 0),
    FPROP_SANCTUARY_2 = (1 << 2),
    FPROP_BLOODY      = (1 << 3),
    FPROP_VAULT       = (1 << 4),
    FPROP_HIGHLIGHT   = (1 << 5)
    // NOTE: Bloody floor and sanctuary are exclusive.

Deletion in crawl-ref/source/enum.h at line 1074 [10.3287960]

B:BD[32.913149] → [9.17116:17200]

B:BD[9.17200] → [13.8533:8556]

B:BD[13.8556] → [40.8283:8365]

};
enum floor_property_type
{
    FPROP_NONE,          // 0
    FPROP_SANCTUARY_1,
    FPROP_SANCTUARY_2,
    FPROP_BLOODY
    // Bloody floor and sanctuary are exclusive, so that's okay.

Insertion in crawl-ref/source/effects.cc at line 2411 [10.3382105]
[41.3372]
[42.7673]
```
    std::vector<coord_def> targets;
```
Insertion in crawl-ref/source/effects.cc at line 2417 [10.3382105]
[42.7725]
[42.7725]
```
        targets.clear();
```

Replacement in crawl-ref/source/effects.cc at line 2425 [10.3382105]

B:BD[42.7986] → [42.7986:8255]

        for (int xi = c1.x; xi <= c2.x; xi++)
            for (int yi = c1.y; yi <= c2.y; yi++)
            {
                if (is_terrain_seen(xi, yi))
                    count_known++;
            }
        if (count_known < size*size/6)
            break;
    }

[42.7986]

[42.8255]

        for (rectangle_iterator ri(c1, c2); ri; ++ri)
            if (is_terrain_seen(*ri))
                count_known++;

Replacement in crawl-ref/source/effects.cc at line 2429 [10.3382105]

B:BD[42.8256] → [42.8256:8399]

    if (msg)
    {
        mprf(MSGCH_DIAGNOSTICS, "Changing labyrinth from (%d, %d) to (%d, %d)",
             c1.x, c1.y, c2.x, c2.y);
    }

[42.8256]

[42.8399]

        if (tries > 1 && count_known > size*size/6)
            continue;

Replacement in crawl-ref/source/effects.cc at line 2432 [10.3382105]

B:BD[42.8400] → [41.3429:3630]

∅:D[41.3630] → [42.8400:8524]

B:BD[42.8400] → [42.8400:8524]

    // Fill a vector with wall grids that are potential targets for swapping
    // against floor, i.e. are flanked by walls to two cardinal directions,
    // and by floor on the two remaining sides.
    std::vector<coord_def> targets;
    for (int xi = c1.x; xi <= c2.x; xi++)
        for (int yi = c1.y; yi <= c2.y; yi++)

[42.8400]

[42.8524]

        // Fill a vector with wall grids that are potential targets for
        // swapping against floor, i.e. are flanked by walls to two cardinal
        // directions, and by floor on the two remaining sides.
        for (rectangle_iterator ri(c1, c2); ri; ++ri)

Replacement in crawl-ref/source/effects.cc at line 2437 [10.3382105]

B:BD[42.8534] → [42.8534:8639]

            const coord_def c(xi, yi);
            if (is_terrain_seen(xi, yi) || !grid_is_wall(grd(c)))

[42.8534]

[42.8639]

            if (is_terrain_seen(*ri) || !grid_is_wall(grd(*ri)))

Replacement in crawl-ref/source/effects.cc at line 2440 [10.3382105]

B:BD[42.8666] → [6.5487:5560]

∅:D[6.5560] → [42.8712:8750]

B:BD[42.8712] → [42.8712:8750]

            if (_grid_is_flanked_by_walls(c) && _deadend_check_floor(c))
                targets.push_back(c);

[42.8666]

[42.8750]

            // Skip on grids inside vaults so as not to disrupt them.
            if (testbits(env.map(*ri).property, FPROP_VAULT))
                continue;
            if (_grid_is_flanked_by_walls(*ri) && _deadend_check_floor(*ri))
                targets.push_back(*ri);

Insertion in crawl-ref/source/effects.cc at line 2447 [10.3382105]
[42.8760]
[42.8760]
```
        if (targets.size() >= 8)
            break;
    }
```

Insertion in crawl-ref/source/effects.cc at line 2457 [10.3382105]

[42.8877]

    }
    if (msg)
    {
        mprf(MSGCH_DIAGNOSTICS, "Changing labyrinth from (%d, %d) to (%d, %d)",
             c1.x, c1.y, c2.x, c2.y);

Insertion in crawl-ref/source/effects.cc at line 2477 [10.3382105]

[43.5234]

[42.9311]


    for (rectangle_iterator ri(1); ri; ++ri)
        env.map(*ri).property &= ~(FPROP_HIGHLIGHT);

Insertion in crawl-ref/source/effects.cc at line 2481 [10.3382105]
[42.9312]
[41.3631]

Insertion in crawl-ref/source/effects.cc at line 2574 [10.3382105]

[6.5935]

        env.map(c).property |= FPROP_HIGHLIGHT;
        env.map(p).property |= FPROP_HIGHLIGHT;

Insertion in crawl-ref/source/effects.cc at line 2591 [10.3382105]

[6.6431]

            }
            else if (old_grid != DNGN_ROCK_WALL && old_grid != DNGN_STONE_WALL
                     && old_grid != DNGN_METAL_WALL)
            {
                old_grid = grd[p.x][p.y+1];

Insertion in crawl-ref/source/effects.cc at line 2597 [10.3382105]

[6.6445]

[42.11937]

        }
        else if (old_grid != DNGN_ROCK_WALL && old_grid != DNGN_STONE_WALL
                 && old_grid != DNGN_METAL_WALL)
        {
            old_grid = grd[p.x+1][p.y];

Replacement in crawl-ref/source/effects.cc at line 2621 [10.3382105]

∅:D[41.5648] → [42.11992:12080]

B:BD[42.11992] → [42.11992:12080]

    for (int xi = c1.x; xi <= c2.x; xi++)
        for (int yi = c1.y; yi <= c2.y; yi++)

[41.5648]

[42.12080]

    for (rectangle_iterator ri(c1, c2); ri; ++ri)
    {
        if (!grid_is_wall(grd(*ri)) || igrd(*ri) == NON_ITEM)
            continue;
        if (msg)

Replacement in crawl-ref/source/effects.cc at line 2628 [10.3382105]

B:BD[42.12090] → [42.12090:12191]

            const coord_def c(xi, yi);
            if (!grid_is_wall(grd(c)) || igrd(c) == NON_ITEM)

[42.12090]

[42.12191]

            mprf(MSGCH_DIAGNOSTICS,
                 "Need to move around some items at pos (%d, %d)...",
                 ri->x, ri->y);
        }
        // Search the eight possible directions in random order.
        std::random_shuffle(dirs.begin(), dirs.end(), random2);
        for (unsigned int i = 0; i < dirs.size(); i++)
        {
            const coord_def p = *ri + dirs[i];
            if (!in_bounds(p))

Replacement in crawl-ref/source/effects.cc at line 2640 [10.3382105]
B:BD[42.12218] → [42.12218:12239]
```
            if (msg)
```
[42.12218]
[42.12239]
```
            if (_is_floor(grd(p)))
```

Replacement in crawl-ref/source/effects.cc at line 2642 [10.3382105]

B:BD[42.12253] → [42.12253:12411]

B:BD[42.12411] → [41.5649:5718]

∅:D[41.5718] → [42.12411:12601]

B:BD[42.12411] → [42.12411:12601]

B:BD[42.12601] → [7.2562:2667]

                mprf(MSGCH_DIAGNOSTICS,
                     "Need to move around some items at pos (%d, %d)...",
                     xi, yi);
            }
            // Search the eight possible directions in random order.
            std::random_shuffle(dirs.begin(), dirs.end(), random2);
            for (unsigned int i = 0; i < dirs.size(); i++)
            {
                const coord_def p = c + dirs[i];
                if (!in_bounds(p))
                    continue;
                if (_is_floor(grd(p)))

[42.12253]

[42.12643]

                // Once a valid grid is found, move all items from the
                // stack onto it.
                int it = igrd(*ri);
                while (it != NON_ITEM)

Replacement in crawl-ref/source/effects.cc at line 2647 [10.3382105]

B:BD[42.12661] → [41.5796:5909]

∅:D[41.5909] → [42.12661:12742]

B:BD[42.12661] → [42.12661:12742]

                    // Once a valid grid is found, move all items from the
                    // stack onto it.
                    int it = igrd(c);
                    while (it != NON_ITEM)

[42.12661]

[42.12742]

                    mitm[it].pos.x = p.x;
                    mitm[it].pos.y = p.y;
                    if (mitm[it].link == NON_ITEM)

Replacement in crawl-ref/source/effects.cc at line 2651 [10.3382105]

B:BD[42.12764] → [42.12764:12856]

B:BD[42.12856] → [7.2668:2988]

∅:D[7.2988] → [42.12856:12900]

B:BD[42.12856] → [42.12856:12900]

                        mitm[it].pos.x = p.x;
                        mitm[it].pos.y = p.y;
                        if (mitm[it].link == NON_ITEM)
                        {
                            // Link to the stack on the target grid p,
                            // or NON_ITEM, if empty.
                            mitm[it].link = igrd(p);
                            break;
                        }
                        it = mitm[it].link;

[42.12764]

[42.12900]

                        // Link to the stack on the target grid p,
                        // or NON_ITEM, if empty.
                        mitm[it].link = igrd(p);
                        break;

Insertion in crawl-ref/source/effects.cc at line 2656 [10.3382105]

[42.12922]

[42.12967]

                    it = mitm[it].link;
                }

Replacement in crawl-ref/source/effects.cc at line 2659 [10.3382105]

B:BD[42.12968] → [7.2989:3041]

∅:D[7.3041] → [42.12968:13047]

B:BD[42.12968] → [42.12968:13047]

                    // Move entire stack over to p.
                    igrd(p) = igrd(c);
                    igrd(c) = NON_ITEM;

[42.12968]

[41.6019]

                // Move entire stack over to p.
                igrd(p) = igrd(*ri);
                igrd(*ri) = NON_ITEM;

Replacement in crawl-ref/source/effects.cc at line 2663 [10.3382105]

B:BD[41.6020] → [41.6020:6240]

                    if (msg)
                    {
                        mprf(MSGCH_DIAGNOSTICS, "Moved items over to (%d, %d)",
                             p.x, p.y);
                    }
                    break;

[41.6020]

[42.13047]

                if (msg)
                {
                    mprf(MSGCH_DIAGNOSTICS, "Moved items over to (%d, %d)",
                         p.x, p.y);

Insertion in crawl-ref/source/effects.cc at line 2668 [10.3382105]
[42.13065]
[42.13288]
```
                break;
```
Insertion in crawl-ref/source/effects.cc at line 2671 [10.3382105]
[42.13312]
[42.13312]
```
    }
```
Replacement in crawl-ref/source/effects.cc at line 3340 [10.3382105]
B:BD[44.4229] → [14.70638:70683]
```
     dungeon_feature_type grid = grd(where);
```
[44.4229]
[45.23888]
```
    dungeon_feature_type grid = grd(where);
```

Replacement in crawl-ref/source/effects.cc at line 3342 [10.3382105]

∅:D[45.23889] → [46.8300:8374]

B:BD[46.8300] → [46.8300:8374]

B:BD[46.8381] → [46.8381:8398]

     if (grid < DNGN_DRY_FOUNTAIN_BLUE || grid > DNGN_DRY_FOUNTAIN_BLOOD)
         return;

[45.23889]

[46.8405]

    if (grid < DNGN_DRY_FOUNTAIN_BLUE || grid > DNGN_DRY_FOUNTAIN_BLOOD)
        return;

Replacement in crawl-ref/source/effects.cc at line 3346 [10.3382105]

B:BD[14.70685] → [14.70685:70724]

∅:D[47.2691] → [44.4254:4320]

∅:D[46.8447] → [44.4254:4320]

∅:D[14.70724] → [44.4254:4320]

B:BD[44.4254] → [44.4254:4320]

     for ( int i = 0; i < tries; ++i )
     {
          if (!one_chance_in(100))
              continue;

[14.70685]

[46.8448]

    for (int i = 0; i < tries; ++i)
    {
        if (!one_chance_in(100))
            continue;

Replacement in crawl-ref/source/effects.cc at line 3351 [10.3382105]

B:BD[46.8449] → [48.10900:10942]

B:BD[48.10942] → [14.70725:70788]

          // Make it start flowing again.
          grd(where) = static_cast<dungeon_feature_type> (grid

[46.8449]

[46.8552]

        // Make it start flowing again.
        grd(where) = static_cast<dungeon_feature_type> (grid

Replacement in crawl-ref/source/effects.cc at line 3355 [10.3382105]

B:BD[47.2693] → [14.70789:70876]

          if (is_terrain_seen(where))
              set_envmap_obj(where, grd(where));

[47.2693]

[44.4554]

        if (is_terrain_seen(where))
            set_envmap_obj(where, grd(where));

Replacement in crawl-ref/source/effects.cc at line 3358 [10.3382105]

B:BD[44.4555] → [48.10991:11024]

B:BD[48.11024] → [14.70877:70967]

          // Clean bloody floor.
          if (is_bloodcovered(where))
              env.map(where).property = FPROP_NONE;

[44.4555]

[47.2694]

        // Clean bloody floor.
        if (is_bloodcovered(where))
            env.map(where).property &= ~(FPROP_BLOODY);

Replacement in crawl-ref/source/effects.cc at line 3362 [10.3382105]

B:BD[47.2695] → [48.11025:11075]

B:BD[48.11075] → [14.70968:71138]

          // Chance of cleaning adjacent squares.
          for ( adjacent_iterator ai(where); ai; ++ai )
              if (is_bloodcovered(*ai) && one_chance_in(5))
                  env.map(*ai).property = FPROP_NONE;

[47.2695]

[14.71138]

        // Chance of cleaning adjacent squares.
        for (adjacent_iterator ai(where); ai; ++ai)
            if (is_bloodcovered(*ai) && one_chance_in(5))
                env.map(*ai).property &= ~(FPROP_BLOODY);

Replacement in crawl-ref/source/effects.cc at line 3367 [10.3382105]
B:BD[14.71139] → [14.71139:71156]
∅:D[46.8767] → [44.5059:5066]
∅:D[14.71156] → [44.5059:5066]
B:BD[44.5059] → [44.5059:5066]
```
          break;
     }
```
[14.71139]
[49.4649]
```
        break;
   }
```
Insertion in crawl-ref/source/dungeon.cc at line 3926 [10.3429798]
[10.3594090]
[10.3594195]
```
    mpr("in _build_minivaults");
```
Insertion in crawl-ref/source/dungeon.cc at line 3973 [10.3429798]
[34.14398]
[50.9086]
```
    bool vault_prop = false;
```

Insertion in crawl-ref/source/dungeon.cc at line 4000 [10.3429798]

[10.3597298]

[14.81928]

        env.map(*ri).property |= FPROP_VAULT;
        vault_prop = true;

Insertion in crawl-ref/source/dungeon.cc at line 4004 [10.3429798]
[51.2763]
[14.81935]
```
    if (vault_prop)
        mpr("feature property set to vault");
```
Insertion in crawl-ref/source/dungeon.cc at line 4494 [10.3429798]
[52.7979]
[53.7488]
```
    mpr("in _build_secondary_vault()");
```
Insertion in crawl-ref/source/dungeon.cc at line 4513 [10.3429798]
[10.3597425]
[10.3597584]
```
    mpr("in _build_vaults");
```
Insertion in crawl-ref/source/dungeon.cc at line 4547 [10.3429798]
[10.3599021]
[33.6230]
```
    bool vault_prop = false;
```

Insertion in crawl-ref/source/dungeon.cc at line 4574 [10.3429798]

[10.3599488]

[14.82901]

        env.map(*ri).property |= FPROP_VAULT;
        vault_prop = true;

Insertion in crawl-ref/source/dungeon.cc at line 4578 [10.3429798]
[10.3599495]
[33.6419]
```
    if (vault_prop)
        mpr("feature property set to vault");
```
Insertion in crawl-ref/source/dungeon.cc at line 6727 [10.3429798]
[54.763]
[54.763]
```
    mpr("in _place_extra_lab_minivaults()");
```

Replacement in crawl-ref/source/beam.cc at line 2933 [10.4128068]

B:BD[12.60081] → [12.60081:60131]

                env.map(p).property = FPROP_NONE;

[12.60081]

[10.4213132]

                env.map(p).property &= ~(FPROP_BLOODY);

Replacement in crawl-ref/source/beam.cc at line 3012 [10.4128068]

B:BD[12.60577] → [12.60577:60627]

                env.map(p).property = FPROP_NONE;

[12.60577]

[10.4214191]

                env.map(p).property &= ~(FPROP_BLOODY);

Change floor_property (blood, sanctuary) to flags, and add two new

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.h at line 170 [10.13254]

Deletion in crawl-ref/source/view.cc at line 199 [10.16817]

Replacement in crawl-ref/source/view.cc at line 203 [10.16817]

Replacement in crawl-ref/source/view.cc at line 209 [10.16817]

Replacement in crawl-ref/source/view.cc at line 445 [10.16817]

Replacement in crawl-ref/source/view.cc at line 447 [10.16817]

Insertion in crawl-ref/source/view.cc at line 640 [10.16817]

Deletion in crawl-ref/source/view.cc at line 4996 [10.16817]

Replacement in crawl-ref/source/view.cc at line 4997 [10.16817]

Insertion in crawl-ref/source/terrain.cc at line 507 [19.26938]

Replacement in crawl-ref/source/terrain.cc at line 512 [19.26938]

Replacement in crawl-ref/source/terrain.cc at line 520 [19.26938]

Replacement in crawl-ref/source/terrain.cc at line 528 [19.26938]

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

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

Replacement in crawl-ref/source/stuff.cc at line 140 [10.224557]

Insertion in crawl-ref/source/stuff.cc at line 142 [10.224557]

Replacement in crawl-ref/source/spells3.cc at line 1418 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1420 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1423 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1538 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1557 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1563 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1614 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1620 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1671 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1696 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1699 [10.531613]

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

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

Replacement in crawl-ref/source/misc.cc at line 1108 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 1146 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 1149 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 1194 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 1235 [10.1933596]

Insertion in crawl-ref/source/maps.cc at line 231 [10.2007666]

Replacement in crawl-ref/source/maps.cc at line 233 [10.2007666]

Insertion in crawl-ref/source/maps.cc at line 236 [10.2007666]

Insertion in crawl-ref/source/maps.cc at line 238 [10.2007666]

Insertion in crawl-ref/source/maps.cc at line 245 [10.2007666]

Replacement in crawl-ref/source/maps.cc at line 247 [10.2007666]

Insertion in crawl-ref/source/maps.cc at line 251 [10.2007666]

Insertion in crawl-ref/source/maps.cc at line 253 [10.2007666]

Insertion in crawl-ref/source/maps.cc at line 287 [10.2007666]

Insertion in crawl-ref/source/files.cc at line 1136 [10.3084589]

Deletion in crawl-ref/source/files.cc at line 1194 [10.3084589]

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

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