fiddlerwoaroof/crawl - Change AUJG42P2TOWAVVU6HBT3D7USOSZCRPQS7FEUGV57HVNULEFDPTSQC

Rewrite part of the exclusion code.

Exclusion radius 0 no longer encodes "no exclusion".
toggle_exclusion split into set_exclusion and del_exclusion: It was never used as a toggle.
Exclusion updates for changed cells unified in void update_exclusion_los(std::vector coord_def changed). Now doesn't leave invalidly non-uptodate exclusions laying around.

Still need to find out why off-level exclusions aren't updated after restore.

Created by Robert Vollmert on October 15, 2009

AUJG42P2TOWAVVU6HBT3D7USOSZCRPQS7FEUGV57HVNULEFDPTSQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 2563 [7.16817]

B:BD[6.669] → [6.669:746]

B:BD[6.746] → [8.41:93]

            if (is_exclude_root(p))
                cycle_exclude_radius(p);
            else
                toggle_exclude(p);

[6.669]

[9.682]

            cycle_exclude_radius(p);

Replacement in crawl-ref/source/view.cc at line 4150 [7.16817]

B:BD[10.2721] → [2.6:80]

                if (in_bounds(gc) && see_grid(gc) && is_exclude_root(gc))

[10.2721]

[2.80]

                if (in_bounds(gc) && see_grid(gc))

Replacement in crawl-ref/source/view.cc at line 4367 [7.16817]

B:BD[11.2049] → [11.2049:2142]

        if (!update_excludes.empty())
        {
            mark_all_excludes_non_updated();

[11.2049]

[11.2142]

        update_exclusion_los(update_excludes);

Deletion in crawl-ref/source/view.cc at line 4369 [7.16817]
B:BD[11.2143] → [11.2143:2271]
∅:D[11.2271] → [12.74314:74324]
B:BD[12.74314] → [12.74314:74324]
∅:D[12.74324] → [7.110239:110240]
B:BD[7.110239] → [7.110239:110240]
```
            for (unsigned int k = 0; k < update_excludes.size(); k++)
                update_exclusion_los(update_excludes[k]);
        }
```

Replacement in crawl-ref/source/travel.h at line 61 [13.29464]

B:BD[6.1289] → [2.356:494]

void toggle_exclude(const coord_def &p, bool autoexcl = false);
void set_exclude(const coord_def &p, int radius2, bool autoexcl = false);

[6.1289]

[2.494]

void del_exclude(const coord_def &p);
void set_exclude(const coord_def &p, int radius = LOS_RADIUS, bool autoexcl = false);

Replacement in crawl-ref/source/travel.h at line 350 [13.29464]

B:BD[14.255] → [11.2492:2577]

void update_exclusion_los(const coord_def &p);
void mark_all_excludes_non_updated();

[14.255]

[13.36559]

void update_exclusion_los(std::vector<coord_def> changed);

Insertion in crawl-ref/source/travel.h at line 361 [13.29464]
[6.1491]
[14.322]
```
    int radius_sq() const;
```
Insertion in crawl-ref/source/travel.h at line 363 [13.29464]
[14.351]
[14.351]
```
    bool affects(const coord_def& p) const;
```
Deletion in crawl-ref/source/travel.h at line 371 [13.29464]
B:BD[6.1590] → [6.1590:1623]
B:BD[6.1623] → [5.33:71]
∅:D[5.71] → [6.1667:1673]
B:BD[6.1667] → [6.1667:1673]
```
    int radius_sq() const
    {
        return (radius * radius + 1);
    }
```

Replacement in crawl-ref/source/travel.cc at line 281 [13.39949]

B:BD[11.2840] → [4.269:332]

    los_param_excl(const coord_def& c) : los_param_trans(c) {}

[11.2840]

[11.2875]

    int radius_sq;
    los_param_excl(const coord_def& c, int r)
        : los_param_trans(c), radius_sq(r)
    {
    }
    bool los_bounds(const coord_def& p) const
    {
        return (p.abs() <= radius_sq &&
                los_param_trans::los_bounds(p));
    }

Insertion in crawl-ref/source/travel.cc at line 323 [13.39949]

[4.1181]

[11.3710]


int travel_exclude::radius_sq() const
{
    return (radius > 0 ? radius*radius + 1 : 0);
}

Replacement in crawl-ref/source/travel.cc at line 331 [13.39949]
B:BD[14.428] → [4.1182:1222]
```
    losight(show, los_param_excl(pos));
```
[14.428]
[11.3822]
```
    losight(show, los_param_excl(pos, radius_sq()));
```

Insertion in crawl-ref/source/travel.cc at line 333 [13.39949]

[11.3843]

[14.457]

}
bool travel_exclude::affects(const coord_def& p) const
{
    if (!uptodate)
        mprf(MSGCH_ERROR, "exclusion not up-to-date: e (%d,%d) p (%d,%d)",
             pos.x, pos.y, p.x, p.y);
    return (see_grid(show, pos, p));

Replacement in crawl-ref/source/travel.cc at line 349 [13.39949]
B:BD[14.596] → [11.3844:3890]
```
void update_exclusion_los(const coord_def &p)
```
[14.596]
[14.636]
```
void _mark_excludes_non_updated(const coord_def &p)
```

Replacement in crawl-ref/source/travel.cc at line 352 [13.39949]

B:BD[14.698] → [11.3891:3930]

B:BD[11.3930] → [3.336:416]

∅:D[3.416] → [11.4006:4016]

B:BD[11.4006] → [11.4006:4016]

        if (!curr_excludes[i].uptodate
            && (curr_excludes[i].pos - p).abs() <= LOS_RADIUS * LOS_RADIUS + 1)
        {

[14.698]

[14.758]

        curr_excludes[i].uptodate = curr_excludes[i].uptodate &&
            (curr_excludes[i].pos - p).abs() <= curr_excludes[i].radius_sq();
}
void _update_exclusion_los()
{
    for (unsigned int i = 0; i < curr_excludes.size(); i++)
        if (!curr_excludes[i].uptodate)

Deletion in crawl-ref/source/travel.cc at line 361 [13.39949]
B:BD[14.807] → [11.4017:4027]
```
        }
```

Replacement in crawl-ref/source/travel.cc at line 363 [13.39949]

B:BD[11.4030] → [11.4030:4067]

void mark_all_excludes_non_updated()

[11.4030]

[11.4067]

/*
 * Update exclusions' LOS to reflect changes within their range.
 * "changed" is a list of coordinates that have been changed.
 * Only exclusions that might have one of the changed points
 * in view are updated.
 */
void update_exclusion_los(std::vector<coord_def> changed)

Replacement in crawl-ref/source/travel.cc at line 371 [13.39949]

B:BD[11.4069] → [11.4069:4172]

    for (unsigned int i = 0; i < curr_excludes.size(); i++)
        curr_excludes[i].uptodate = false;

[11.4069]

[13.45845]

    if (changed.empty())
        return;
    for (unsigned int i = 0; i < changed.size(); ++i)
        _mark_excludes_non_updated(changed[i]);
    _update_exclusion_los();

Replacement in crawl-ref/source/travel.cc at line 382 [13.39949]

B:BD[13.45888] → [15.182:238]

B:BD[15.238] → [14.808:927]

    for (int i = 0, count = exc.size(); i < count; ++i)
        if ((exc[i].pos - p).abs() < exc[i].radius_sq()
            && see_grid(exc[i].show, exc[i].pos, p))
        {

[13.45888]

[6.2138]

    for (unsigned int i = 0; i < exc.size(); ++i)
        if (exc[i].affects(p))

Deletion in crawl-ref/source/travel.cc at line 385 [13.39949]
B:BD[6.2165] → [14.928:938]
∅:D[14.938] → [16.723:724]
B:BD[6.2165] → [16.723:724]
```
        }
```

Replacement in crawl-ref/source/travel.cc at line 395 [13.39949]

B:BD[13.46220] → [13.46220:46286]

    for (int i = 0, count = curr_excludes.size(); i < count; ++i)

[15.489]

[6.2344]

    for (unsigned int i = 0; i < curr_excludes.size(); ++i)

Deletion in crawl-ref/source/travel.cc at line 398 [13.39949]
B:BD[6.2423] → [16.832:833]

Replacement in crawl-ref/source/travel.cc at line 408 [13.39949]

B:BD[17.249] → [16.871:928]

static void _tile_exclude_gmap_update(const coord_def p)

[17.249]

[17.305]

static void _tile_exclude_gmap_update(const coord_def &p)

Insertion in crawl-ref/source/travel.cc at line 422 [13.39949]

[17.579]

[13.46425]

static void _exclude_update()
{
    if (can_travel_interlevel())
    {
        LevelInfo &li = travel_cache.get_level_info(level_id::current());
        li.update();
    }
    set_level_exclusion_annotation(get_exclusion_desc());
}
static void _exclude_update(const coord_def &p)
{
#ifdef USE_TILE
    _tile_exclude_gmap_update(p);
#endif
    _exclude_update();
}

Replacement in crawl-ref/source/travel.cc at line 474 [13.39949]

B:BD[17.650] → [17.650:697]

         toggle_exclude(curr_excludes[i].pos);

[17.650]

[18.345]

        _tile_exclude_gmap_update(curr_excludes[i].pos);

Insertion in crawl-ref/source/travel.cc at line 476 [13.39949]
[18.352]
[13.47270]
Replacement in crawl-ref/source/travel.cc at line 480 [13.39949]
∅:D[18.354] → [13.47298:47337]
∅:D[17.711] → [13.47298:47337]
B:BD[13.47298] → [13.47298:47337]
B:BD[13.47337] → [19.1349:1423]
∅:D[19.1423] → [13.47453:47480]
B:BD[13.47453] → [13.47453:47480]
```
    if (can_travel_interlevel())
    {
        LevelInfo &li = travel_cache.get_level_info(level_id::current());
        li.update();
    }
```
[18.354]
[13.47480]
```
    _exclude_update();
```
Insertion in crawl-ref/source/travel.cc at line 483 [13.39949]
[13.47483]
[6.2525]
```
// Cycles the radius of an exclusion, including "off" state.
```
Insertion in crawl-ref/source/travel.cc at line 486 [13.39949]
[13.47519]
[16.1277]
```
    // XXX: scanning through curr_excludes twice
```
Replacement in crawl-ref/source/travel.cc at line 489 [13.39949]
B:BD[6.2630] → [6.2630:2710]
B:BD[6.2710] → [20.228:328]
∅:D[20.328] → [6.2866:2876]
∅:D[8.478] → [6.2866:2876]
B:BD[6.2866] → [6.2866:2876]
B:BD[6.2876] → [21.337:338]
∅:D[21.338] → [18.355:371]
B:BD[6.2885] → [18.355:371]
B:BD[18.371] → [16.1331:1369]
∅:D[16.1369] → [18.408:416]
B:BD[18.408] → [18.408:416]
∅:D[18.416] → [6.2885:2922]
B:BD[6.2885] → [6.2885:2922]
```
        int &curr_radius = exc->radius;
        switch (curr_radius)
        {
        case LOS_RADIUS: curr_radius = 1; break;
        case 1         : set_exclude(p, 0); break;
        }
#ifdef USE_TILE
        _tile_exclude_gmap_update(p);
#endif
        if (can_travel_interlevel())
```
[6.2630]
[6.2922]
```
        if (exc->radius == LOS_RADIUS)
            set_exclude(p, 0);
        else
```

Replacement in crawl-ref/source/travel.cc at line 493 [13.39949]

B:BD[6.2932] → [6.2932:3035]

            LevelInfo &li = travel_cache.get_level_info(level_id::current());
            li.update();

[6.2932]

[6.3035]

            ASSERT(exc->radius == 0);
            del_exclude(p);

Insertion in crawl-ref/source/travel.cc at line 497 [13.39949]
[6.3051]
[6.3051]
```
    else
        set_exclude(p, LOS_RADIUS);
```

Replacement in crawl-ref/source/travel.cc at line 501 [13.39949]

B:BD[6.3054] → [2.1254:1309]

void toggle_exclude(const coord_def &p, bool autoexcl)

[6.3054]

[6.3094]

// Remove a possible exclude.
void del_exclude(const coord_def &p)

Replacement in crawl-ref/source/travel.cc at line 504 [13.39949]

B:BD[6.3096] → [6.3096:3160]

B:BD[6.3160] → [2.1310:1356]

∅:D[20.365] → [17.712:729]

∅:D[8.506] → [17.712:729]

∅:D[2.1356] → [17.712:729]

B:BD[6.3196] → [17.712:729]

B:BD[17.729] → [16.1370:1404]

∅:D[16.1404] → [17.762:769]

B:BD[17.762] → [17.762:769]

B:BD[17.769] → [2.1357:1415]

    if (is_exclude_root(p))
        set_exclude(p, 0);
    else
        set_exclude(p, LOS_RADIUS, autoexcl);
#ifdef USE_TILE
    _tile_exclude_gmap_update(p);
#endif
    set_level_exclusion_annotation(get_exclusion_desc());

[6.3096]

[6.3196]

    for (unsigned int i = 0; i < curr_excludes.size(); ++i)
        if (curr_excludes[i].pos == p)
        {
            curr_excludes.erase(curr_excludes.begin() + i);
            break;
        }
    _exclude_update(p);

Insertion in crawl-ref/source/travel.cc at line 513 [13.39949]
[6.3199]
[2.1416]
```
// Set or update an exclude.
```
Replacement in crawl-ref/source/travel.cc at line 524 [13.39949]
B:BD[6.3396] → [6.3396:3424]
```
    if (is_exclude_root(p))
```
[21.340]
[13.47767]
```
    if (travel_exclude *exc = _find_exclude_root(p))
```

Replacement in crawl-ref/source/travel.cc at line 526 [13.39949]

B:BD[13.47773] → [13.47773:47853]

B:BD[13.47853] → [6.3425:3468]

∅:D[6.3468] → [13.47942:47956]

B:BD[13.47942] → [13.47942:47956]

B:BD[13.47956] → [6.3469:3771]

∅:D[6.3771] → [13.48046:48070]

B:BD[13.48046] → [13.48046:48070]

        for (int i = 0, count = curr_excludes.size(); i < count; ++i)
        {
            if (curr_excludes[i].pos == p)
            {
                if (!radius)
                {
                    curr_excludes.erase( curr_excludes.begin() + i );
                    break ;
                }
                else
                {
                    curr_excludes[i].radius = radius;
                    return;
                }
            }
        }

[13.47773]

[13.48070]

        exc->radius = radius;
        exc->set_exclude_show();

Replacement in crawl-ref/source/travel.cc at line 539 [13.39949]
B:BD[13.48166] → [13.48166:48205]
B:BD[13.48205] → [19.1424:1498]
∅:D[19.1498] → [13.48321:48342]
B:BD[13.48321] → [13.48321:48342]
B:BD[13.48342] → [2.1720:1726]
```
    if (can_travel_interlevel())
    {
        LevelInfo &li = travel_cache.get_level_info(level_id::current());
        li.update();
    }
```
[13.48166]
[2.1726]
```
    _exclude_update(p);
```

Replacement in crawl-ref/source/travel.cc at line 546 [13.39949]

B:BD[2.1913] → [2.1913:2043]

    ASSERT(in_bounds(p) && see_grid(p) && is_exclude_root(p));
    for (int i = 0, count = curr_excludes.size(); i < count; ++i)

[2.1913]

[2.2043]

    if (travel_exclude *exc = _find_exclude_root(p))

Replacement in crawl-ref/source/travel.cc at line 548 [13.39949]

B:BD[2.2049] → [2.2049:2479]

        if (curr_excludes[i].pos == p)
        {
            if (curr_excludes[i].autoexclude)
            {
                const monsters *m = monster_at(p);
                if (!m || !you.can_see(m) || m->type != curr_excludes[i].mon)
                {
                    set_exclude(p, 0);
                    set_level_exclusion_annotation(get_exclusion_desc());
                }
            }
            break;
        }

[2.2049]

[2.2479]

        const monsters *m = monster_at(p);
        if (exc->autoexclude && (!m || !you.can_see(m) || m->type != exc->mon))
            del_exclude(p);

Replacement in crawl-ref/source/travel.cc at line 554 [13.39949]
B:BD[2.2488] → [2.2488:2535]
```
// Lists alls exclusions on the current level.
```
[2.2488]
[2.2535]
```
// Lists all exclusions on the current level.
```
Replacement in crawl-ref/source/misc.cc at line 2783 [7.1933596]
B:BD[22.6820] → [2.8796:8838]
```
        toggle_exclude(mon->pos(), true);
```
[22.6820]
[22.6856]
```
        set_exclude(mon->pos(), true);
```

Replacement in crawl-ref/source/misc.cc at line 2795 [7.1933596]

B:BD[23.4205] → [23.4205:4276]

    if (need_auto_exclude(mon, sleepy) && is_exclude_root(mon->pos()))

[23.4205]

[22.6985]

    if (need_auto_exclude(mon, sleepy))

Replacement in crawl-ref/source/misc.cc at line 2797 [7.1933596]
∅:D[22.6991] → [23.4276:4312]
B:BD[23.4276] → [23.4276:4312]
```
        toggle_exclude(mon->pos());
```
[22.6991]
[22.6992]
```
        del_exclude(mon->pos());
```
Replacement in crawl-ref/source/acr.cc at line 3248 [7.4397395]
B:BD[24.9423] → [24.9423:9450]
∅:D[24.9450] → [7.4466363:4466369]
B:BD[7.4466363] → [7.4466363:4466369]
B:BD[7.4466369] → [24.9451:9598]
∅:D[24.9598] → [7.4466467:4466473]
∅:D[12.1279652] → [7.4466467:4466473]
B:BD[7.4466467] → [7.4466467:4466473]
```
    if (!excludes.empty())
    {
        mark_all_excludes_non_updated();
        for (unsigned int i = 0; i < excludes.size(); ++i)
            update_exclusion_los(excludes[i]);
    }
```
[24.9423]
[24.9599]
```
    update_exclusion_los(excludes);
```

Deletion in crawl-ref/source/acr.cc at line 3404 [7.4397395]

B:BD[25.4264] → [25.4264:4474]

        }
        if (!excludes.empty())
        {
            mark_all_excludes_non_updated();
            for (unsigned int i = 0; i < excludes.size(); ++i)
                update_exclusion_los(excludes[i]);

Insertion in crawl-ref/source/acr.cc at line 3405 [7.4397395]
[26.5674]
[12.1279801]
```
        update_exclusion_los(excludes);
```

Rewrite part of the exclusion code.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 2563 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4150 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4367 [7.16817]

Deletion in crawl-ref/source/view.cc at line 4369 [7.16817]

Replacement in crawl-ref/source/travel.h at line 61 [13.29464]

Replacement in crawl-ref/source/travel.h at line 350 [13.29464]

Insertion in crawl-ref/source/travel.h at line 361 [13.29464]

Insertion in crawl-ref/source/travel.h at line 363 [13.29464]

Deletion in crawl-ref/source/travel.h at line 371 [13.29464]

Replacement in crawl-ref/source/travel.cc at line 281 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 323 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 331 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 333 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 349 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 352 [13.39949]

Deletion in crawl-ref/source/travel.cc at line 361 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 363 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 371 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 382 [13.39949]

Deletion in crawl-ref/source/travel.cc at line 385 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 395 [13.39949]

Deletion in crawl-ref/source/travel.cc at line 398 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 408 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 422 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 474 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 476 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 480 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 483 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 486 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 489 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 493 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 497 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 501 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 504 [13.39949]

Insertion in crawl-ref/source/travel.cc at line 513 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 524 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 526 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 539 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 546 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 548 [13.39949]

Replacement in crawl-ref/source/travel.cc at line 554 [13.39949]

Replacement in crawl-ref/source/misc.cc at line 2783 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2795 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2797 [7.1933596]

Replacement in crawl-ref/source/acr.cc at line 3248 [7.4397395]

Deletion in crawl-ref/source/acr.cc at line 3404 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3405 [7.4397395]