fiddlerwoaroof/crawl - Change L4RYVF46EQKMVOEADGRG4WMPVTQ6NNFGYMU4SHAH6XJIKWVHT77QC

Fixed map marker crashes.

Reduced size of Pan demon bands summoned post-Orb (cbus).

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

Created by dshaligram on August 17, 2007

L4RYVF46EQKMVOEADGRG4WMPVTQ6NNFGYMU4SHAH6XJIKWVHT77QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 2491 [4.39949]

[4.105581]

[2.1277]

    // Copy the current crawl_environment. Note that this is a shallow
    // copy so tmp holds references to map markers.

Insertion in crawl-ref/source/travel.cc at line 2494 [4.39949]

[2.1347]

[4.105614]


    // Clear markers. The tmp env still points at the markers, so we
    // don't leak. XXX: Make crawl_environment fully assignable.
    env.markers.clear();

Replacement in crawl-ref/source/travel.cc at line 2500 [4.39949]

B:BD[4.105658] → [4.105658:105732]

                    absdungeon_depth(target.id.branch, target.id.depth)))

[4.105658]

[4.105732]

                         absdungeon_depth(target.id.branch, target.id.depth)))

Replacement in crawl-ref/source/tags.cc at line 1432 [6.164589]

B:BD[5.1563] → [5.1563:1775]

    // how many markers
    marshallShort(th, env.markers.size());
    for (dgn_marker_map::const_iterator i = env.markers.begin();
         i != env.markers.end(); ++i)
    {
        i->second->write(th);
    }

[5.1563]

[7.2813]

    env.markers.write(th);

Replacement in crawl-ref/source/tags.cc at line 1657 [6.164589]

B:BD[5.1777] → [8.1328:1353]

∅:D[8.1353] → [5.1802:1953]

B:BD[5.1802] → [5.1802:1953]

B:BD[5.1953] → [8.1354:1388]

∅:D[8.1388] → [5.1987:1993]

B:BD[5.1987] → [5.1987:1993]

    env_clear_markers();
    const int nmarkers = unmarshallShort(th);
    for (int i = 0; i < nmarkers; ++i)
    {
        if (map_marker *mark = map_marker::read_marker(th))
            env_add_marker(mark);
    }

[5.1777]

[6.209254]

    env.markers.read(th);

Replacement in crawl-ref/source/monplace.cc at line 877 [6.1641732]
B:BD[9.282] → [9.282:322]
```
        band_size = random_range(4, 8);
```
[9.282]
[6.1661537]
```
        band_size = random_range(1, 3);
```

Replacement in crawl-ref/source/misc.cc at line 536 [6.1933596]

B:BD[10.2460] → [10.2460:2531]

    if (!is_critical_feature(dfeat) && !env_find_marker(pos, MAT_ANY))

[10.2460]

[10.2531]

    if (!is_critical_feature(dfeat) && !env.markers.find(pos, MAT_ANY))

Replacement in crawl-ref/source/misc.cc at line 553 [6.1933596]
B:BD[10.2929] → [10.2929:2966]
```
        env_move_markers(pos, dest);
```
[10.2929]
[11.281]
```
        env.markers.move(pos, dest);
```

Replacement in crawl-ref/source/misc.cc at line 859 [6.1933596]

B:BD[12.1684] → [12.1684:1736]

        env_property_at(you.pos(), MAT_ANY, "dst");

[12.1684]

[12.1736]

        env.markers.property_at(you.pos(), MAT_ANY, "dst");

Insertion in crawl-ref/source/message.cc at line 673 [6.1993826]

[6.2001474]

[13.403]

#ifdef DEBUG_DIAGNOSTICS
    if (you.running)
    {
        mesclr();
        return;
    }
#endif

Deletion in crawl-ref/source/mapmark.h at line 12 [8.10602]
B:BD[8.10783] → [8.10783:10904]
B:BD[8.10904] → [14.5641:5661]
B:BD[14.5661] → [2.9409:9435]
∅:D[12.2212] → [8.10927:10969]
∅:D[14.5661] → [8.10927:10969]
∅:D[2.9435] → [8.10927:10969]
B:BD[8.10927] → [8.10927:10969]
```
// Can't change this order without breaking saves.
enum map_marker_type
{
    MAT_FEATURE,              // Stock marker.
    MAT_LUA_MARKER,
    MAT_CORRUPTION_NEXUS,
    NUM_MAP_MARKER_TYPES,
    MAT_ANY
};
```
Insertion in crawl-ref/source/mapmark.h at line 20 [8.10602]
[8.11139]
[8.11139]
```
    virtual map_marker *clone() const = 0;
```
Insertion in crawl-ref/source/mapmark.h at line 55 [8.10602]
[12.2430]
[8.12091]
```
    map_marker *clone() const;
```
Replacement in crawl-ref/source/mapmark.h at line 72 [8.10602]
B:BD[2.9668] → [2.9668:9669]
[2.9668]
[2.9669]
```
    map_marker *clone() const;
```
Insertion in crawl-ref/source/mapmark.h at line 93 [8.10602]
[8.12631]
[12.2431]
```
    map_marker *clone() const;
```
Replacement in crawl-ref/source/mapmark.h at line 99 [8.10602]
B:BD[8.12713] → [14.6232:6236]
```
   
```
[8.12713]
[8.12802]
```
    
```

Deletion in crawl-ref/source/mapmark.h at line 113 [8.10602]

B:BD[8.13137] → [8.13137:13304]

B:BD[8.13304] → [2.9805:9878]

∅:D[15.262] → [8.13304:13370]

∅:D[2.9878] → [8.13304:13370]

B:BD[8.13304] → [8.13304:13370]

B:BD[8.13370] → [2.9879:9930]

∅:D[2.9930] → [8.13370:13458]

B:BD[8.13370] → [8.13370:13458]

B:BD[8.13458] → [12.2709:2827]

B:BD[12.2827] → [10.3257:3324]

∅:D[12.2827] → [8.13458:13459]

∅:D[10.3324] → [8.13458:13459]

B:BD[8.13458] → [8.13458:13459]

void env_activate_markers();
void env_add_marker(map_marker *);
void env_remove_marker(map_marker *);
void env_remove_markers_at(const coord_def &c, map_marker_type);
std::vector<map_marker*> env_get_all_markers(map_marker_type = MAT_ANY);
map_marker *env_find_marker(const coord_def &c, map_marker_type);
map_marker *env_find_marker(map_marker_type type);
std::vector<map_marker*> env_get_markers(const coord_def &c);
void env_clear_markers();
std::string env_property_at(const coord_def &c, map_marker_type,
                            const std::string &key);
void env_move_markers(const coord_def &from, const coord_def &to);

Insertion in crawl-ref/source/mapmark.cc at line 120 [8.13502]

[8.15839]

}
map_marker *map_feature_marker::clone() const
{
    return new map_feature_marker(pos, feat);

Insertion in crawl-ref/source/mapmark.cc at line 184 [8.13502]

[8.17555]

[14.7698]

map_marker *map_lua_marker::clone() const
{
    map_lua_marker *copy = new map_lua_marker();
    if (get_table())
        copy->check_register_table();
    return copy;
}

Insertion in crawl-ref/source/mapmark.cc at line 411 [8.13502]

[2.10675]

map_marker *map_corruption_marker::clone() const
{
    map_corruption_marker *mark = new map_corruption_marker(pos, duration);
    mark->radius = radius;
    return (mark);
}

Replacement in crawl-ref/source/mapmark.cc at line 426 [8.13502]

B:BD[8.22016] → [8.22016:22044]

void env_activate_markers()

[8.22016]

[8.22044]

map_markers::map_markers() : markers()
{
}
map_markers::map_markers(const map_markers &c) : markers()

Replacement in crawl-ref/source/mapmark.cc at line 432 [8.13502]

B:BD[8.22046] → [8.22046:22143]

    for (dgn_marker_map::iterator i = env.markers.begin();
         i != env.markers.end(); ++i)

[8.22046]

[8.22143]

    init_from(c);
}
map_markers &map_markers::operator = (const map_markers &c)
{
    if (this != &c)
    {
        clear();
        init_from(c);
    }
    return (*this);
}
map_markers::~map_markers()
{
    clear();
}
void map_markers::init_from(const map_markers &c)
{
    for (dgn_marker_map::const_iterator i = c.markers.begin();
         i != c.markers.end(); ++i)

Insertion in crawl-ref/source/mapmark.cc at line 455 [8.13502]

[8.22149]

        add( i->second->clone() );
    }
}
void map_markers::activate_all()
{
    for (dgn_marker_map::iterator i = markers.begin();
         i != markers.end(); ++i)
    {

Replacement in crawl-ref/source/mapmark.cc at line 468 [8.13502]
B:BD[8.22189] → [8.22189:22229]
```
void env_add_marker(map_marker *marker)
```
[8.22189]
[8.22229]
```
void map_markers::add(map_marker *marker)
```

Replacement in crawl-ref/source/mapmark.cc at line 470 [8.13502]

B:BD[8.22231] → [8.22231:22292]

    env.markers.insert(dgn_pos_marker(marker->pos, marker));

[8.22231]

[8.22292]

    markers.insert(dgn_pos_marker(marker->pos, marker));

Replacement in crawl-ref/source/mapmark.cc at line 473 [8.13502]
B:BD[8.22295] → [8.22295:22338]
```
void env_remove_marker(map_marker *marker)
```
[8.22295]
[8.22338]
```
void map_markers::remove(map_marker *marker)
```

Replacement in crawl-ref/source/mapmark.cc at line 476 [8.13502]

B:BD[8.22406] → [8.22406:22458]

        els = env.markers.equal_range(marker->pos);

[8.22406]

[8.22458]

        els = markers.equal_range(marker->pos);

Replacement in crawl-ref/source/mapmark.cc at line 481 [8.13502]
B:BD[8.22578] → [8.22578:22612]
```
            env.markers.erase(i);
```
[8.22578]
[8.22612]
```
            markers.erase(i);
```

Replacement in crawl-ref/source/mapmark.cc at line 488 [8.13502]

B:BD[8.22669] → [8.22669:22765]

void env_remove_markers_at(const coord_def &c,
                           map_marker_type type)

[8.22669]

[8.22765]

void map_markers::remove_markers_at(const coord_def &c,
                                    map_marker_type type)

Replacement in crawl-ref/source/mapmark.cc at line 492 [8.13502]
B:BD[8.22833] → [8.22833:22875]
```
        els = env.markers.equal_range(c);
```
[8.22833]
[8.22875]
```
        els = markers.equal_range(c);
```
Replacement in crawl-ref/source/mapmark.cc at line 499 [8.13502]
B:BD[8.23105] → [8.23105:23143]
```
            env.markers.erase(todel);
```
[8.23105]
[8.23143]
```
            markers.erase(todel);
```

Replacement in crawl-ref/source/mapmark.cc at line 504 [8.13502]

B:BD[8.23162] → [8.23162:23232]

map_marker *env_find_marker(const coord_def &c, map_marker_type type)

[8.23162]

[8.23232]

map_marker *map_markers::find(const coord_def &c, map_marker_type type)

Replacement in crawl-ref/source/mapmark.cc at line 507 [8.13502]
B:BD[8.23312] → [8.23312:23354]
```
        els = env.markers.equal_range(c);
```
[8.23312]
[8.23354]
```
        els = markers.equal_range(c);
```
Replacement in crawl-ref/source/mapmark.cc at line 514 [8.13502]
B:BD[2.10988] → [2.10988:11038]
```
map_marker *env_find_marker(map_marker_type type)
```
[2.10988]
[2.11038]
```
map_marker *map_markers::find(map_marker_type type)
```

Replacement in crawl-ref/source/mapmark.cc at line 516 [8.13502]

B:BD[2.11040] → [2.11040:11143]

    for (dgn_marker_map::const_iterator i = env.markers.begin();
         i != env.markers.end(); ++i)

[2.11040]

[2.11143]

    for (dgn_marker_map::const_iterator i = markers.begin();
         i != markers.end(); ++i)

Replacement in crawl-ref/source/mapmark.cc at line 525 [8.13502]

B:BD[10.3327] → [10.3327:3393]

void env_move_markers(const coord_def &from, const coord_def &to)

[10.3327]

[10.3393]

void map_markers::move(const coord_def &from, const coord_def &to)

Replacement in crawl-ref/source/mapmark.cc at line 528 [8.13502]
B:BD[10.3461] → [10.3461:3506]
```
        els = env.markers.equal_range(from);
```
[10.3461]
[8.23546]
```
        els = markers.equal_range(from);
```
Replacement in crawl-ref/source/mapmark.cc at line 530 [8.13502]
B:BD[8.23547] → [10.3507:3543]
```
    std::list<map_marker*> markers;
```
[8.23547]
[10.3543]
```
    std::list<map_marker*> tmarkers;
```

Replacement in crawl-ref/source/mapmark.cc at line 534 [8.13502]

B:BD[10.3662] → [10.3662:3736]

        markers.push_back(curr->second);
        env.markers.erase(curr);

[10.3662]

[10.3736]

        tmarkers.push_back(curr->second);
        markers.erase(curr);

Replacement in crawl-ref/source/mapmark.cc at line 538 [8.13502]

B:BD[10.3743] → [10.3743:3840]

    for (std::list<map_marker*>::iterator i = markers.begin();
         i != markers.end(); ++i)

[10.3743]

[10.3840]

    for (std::list<map_marker*>::iterator i = tmarkers.begin();
         i != tmarkers.end(); ++i)

Replacement in crawl-ref/source/mapmark.cc at line 542 [8.13502]
B:BD[10.3870] → [10.3870:3898]
```
        env_add_marker(*i);
```
[10.3870]
[10.3898]
```
        add(*i);
```

Replacement in crawl-ref/source/mapmark.cc at line 546 [8.13502]

B:BD[10.3907] → [2.11157:11223]

std::vector<map_marker*> env_get_all_markers(map_marker_type mat)

[10.3907]

[15.311]

std::vector<map_marker*> map_markers::get_all(map_marker_type mat)

Replacement in crawl-ref/source/mapmark.cc at line 549 [8.13502]

B:BD[15.352] → [15.352:455]

    for (dgn_marker_map::const_iterator i = env.markers.begin();
         i != env.markers.end(); ++i)

[15.352]

[15.455]

    for (dgn_marker_map::const_iterator i = markers.begin();
         i != markers.end(); ++i)

Replacement in crawl-ref/source/mapmark.cc at line 558 [8.13502]
∅:D[15.536] → [8.23547:23608]
∅:D[10.3907] → [8.23547:23608]
B:BD[8.23547] → [8.23547:23608]
```
std::vector<map_marker*> env_get_markers(const coord_def &c)
```
[15.536]
[8.23608]
```
std::vector<map_marker*> map_markers::get_markers_at(const coord_def &c)
```
Replacement in crawl-ref/source/mapmark.cc at line 561 [8.13502]
B:BD[8.23688] → [8.23688:23730]
```
        els = env.markers.equal_range(c);
```
[8.23688]
[8.23730]
```
        els = markers.equal_range(c);
```

Replacement in crawl-ref/source/mapmark.cc at line 568 [8.13502]

B:BD[8.23911] → [12.4265:4387]

std::string env_property_at(const coord_def &c, map_marker_type type,
                            const std::string &key)

[8.23911]

[12.4387]

std::string map_markers::property_at(const coord_def &c, map_marker_type type,
                                     const std::string &key)

Replacement in crawl-ref/source/mapmark.cc at line 572 [8.13502]
B:BD[12.4467] → [12.4467:4509]
```
        els = env.markers.equal_range(c);
```
[12.4467]
[12.4509]
```
        els = markers.equal_range(c);
```
Replacement in crawl-ref/source/mapmark.cc at line 582 [8.13502]
∅:D[12.4731] → [8.23911:23936]
B:BD[8.23911] → [8.23911:23936]
```
void env_clear_markers()
```
[12.4731]
[8.23936]
```
void map_markers::clear()
```

Replacement in crawl-ref/source/mapmark.cc at line 584 [8.13502]

B:BD[8.23938] → [8.23938:24035]

    for (dgn_marker_map::iterator i = env.markers.begin();
         i != env.markers.end(); ++i)

[8.23938]

[8.24035]

    for (dgn_marker_map::iterator i = markers.begin();
         i != markers.end(); ++i)

Replacement in crawl-ref/source/mapmark.cc at line 587 [8.13502]

B:BD[8.24061] → [8.24061:24086]

    env.markers.clear();

[8.24061]

[8.24086]

    markers.clear();
}
void map_markers::write(tagHeader &th) const
{
    // how many markers
    marshallShort(th, markers.size());
    for (dgn_marker_map::const_iterator i = markers.begin();
         i != markers.end(); ++i)
    {
        i->second->write(th);
    }

Insertion in crawl-ref/source/mapmark.cc at line 600 [8.13502]

[8.24088]


void map_markers::read(tagHeader &th)
{
    clear();
    const int nmarkers = unmarshallShort(th);
    for (int i = 0; i < nmarkers; ++i)
        if (map_marker *mark = map_marker::read_marker(th))
            add(mark);
}

Replacement in crawl-ref/source/mapdef.cc at line 393 [16.594797]
B:BD[5.7419] → [8.24457:24493]
```
        env_add_marker(markers[i]);
```
[5.7419]
[5.7455]
```
        env.markers.add(markers[i]);
```
Replacement in crawl-ref/source/luadgn.cc at line 983 [17.1232]
B:BD[14.16699] → [14.16699:16728]
```
    env_remove_marker(mark);
```
[14.16699]
[14.16728]
```
    env.markers.remove(mark);
```

Replacement in crawl-ref/source/it_use3.cc at line 575 [6.2870456]

B:BD[5.16074] → [8.28066:28143]

∅:D[8.28143] → [5.16151:16213]

B:BD[5.16151] → [5.16151:16213]

                                env_find_marker(coord_def(count_x, count_y),
                                                MAT_FEATURE);

[5.16074]

[6.2888650]

                                env.markers.find(coord_def(count_x, count_y),
                                                 MAT_FEATURE);

Replacement in crawl-ref/source/it_use3.cc at line 583 [6.2870456]

B:BD[5.16463] → [8.28144:28203]

                                env_remove_marker(marker);

[5.16463]

[6.2889463]

                                env.markers.remove(marker);

Replacement in crawl-ref/source/files.cc at line 745 [6.3084589]

B:BD[18.8317] → [8.28745:28813]

                    env_remove_markers_at(coord_def(i,j), MAT_ANY);

[18.8317]

                    env.markers.remove_markers_at(coord_def(i,j), MAT_ANY);

Replacement in crawl-ref/source/files.cc at line 950 [6.3084589]

B:BD[8.29294] → [8.29294:29379]

        // env_activate_markers() is done in acr.cc.
        env_activate_markers();

[8.29294]

[8.29379]

        // markers are activated in acr.cc.
        env.markers.activate_all();

Insertion in crawl-ref/source/externs.h at line 1246 [6.3270163]

[6.3281637]

[19.6127]

class map_marker;
class tagHeader;
class map_markers
{
public:
    map_markers();
    map_markers(const map_markers &);
    map_markers &operator = (const map_markers &);
    ~map_markers();
    void activate_all();
    void add(map_marker *marker);
    void remove(map_marker *marker);
    void remove_markers_at(const coord_def &c, map_marker_type type = MAT_ANY);
    map_marker *find(const coord_def &c, map_marker_type type = MAT_ANY);
    map_marker *find(map_marker_type type);
    void move(const coord_def &from, const coord_def &to);
    std::vector<map_marker*> get_all(map_marker_type type = MAT_ANY);
    std::vector<map_marker*> get_markers_at(const coord_def &c);
    std::string property_at(const coord_def &c, map_marker_type type,
                            const std::string &key);
    void clear();
    void write(tagHeader &th) const;
    void read(tagHeader &);
private:
    typedef std::multimap<coord_def, map_marker *> dgn_marker_map;
    typedef std::pair<coord_def, map_marker *> dgn_pos_marker;
    void init_from(const map_markers &);
private:
    dgn_marker_map markers;
};

Deletion in crawl-ref/source/externs.h at line 1283 [6.3270163]

B:BD[19.6192] → [5.16859:16999]

class map_marker;
typedef std::multimap<coord_def, map_marker *> dgn_marker_map;
typedef std::pair<coord_def, map_marker *> dgn_pos_marker;

Replacement in crawl-ref/source/externs.h at line 1313 [6.3270163]
B:BD[5.17067] → [5.17067:17121]
```
    dgn_marker_map                           markers;
```
[5.17067]
[5.17121]
```
    map_markers                              markers;
```

Insertion in crawl-ref/source/enum.h at line 1779 [6.3287960]

[6.3326904]

};
// Can't change this order without breaking saves.
enum map_marker_type
{
    MAT_FEATURE,              // Stock marker.
    MAT_LUA_MARKER,
    MAT_CORRUPTION_NEXUS,
    NUM_MAP_MARKER_TYPES,
    MAT_ANY

Replacement in crawl-ref/source/dungeon.cc at line 540 [6.3429798]
B:BD[5.18820] → [8.31158:31183]
```
    env_clear_markers();
```
[5.18820]
[20.4034]
```
    env.markers.clear();
```

Replacement in crawl-ref/source/dungeon.cc at line 654 [6.3429798]

B:BD[21.4763] → [8.31184:31224]

                        env_add_marker(

[21.4763]

[21.4803]

                        env.markers.add(

Replacement in crawl-ref/source/dungeon.cc at line 1427 [6.3429798]

B:BD[8.31997] → [3.304:340]

                    env_add_marker(

[8.31997]

[3.340]

                    env.markers.add(

Replacement in crawl-ref/source/dungeon.cc at line 3095 [6.3429798]

∅:D[22.696] → [23.5236:5303]

B:BD[23.5236] → [23.5236:5303]

                env_remove_markers_at(coord_def(vx, vy), MAT_ANY);

[22.696]

[23.5303]

                env.markers.remove_markers_at(coord_def(vx, vy), MAT_ANY);

Replacement in crawl-ref/source/dungeon.cc at line 3534 [6.3429798]

B:BD[23.7608] → [23.7608:7662]

                    env_get_markers(coord_def(x, y));

[23.7608]

[23.7662]

                    env.markers.get_markers_at(coord_def(x, y));

Replacement in crawl-ref/source/dungeon.cc at line 3547 [6.3429798]
B:BD[10.4845] → [10.4845:4877]
```
        env_activate_markers();
```
[10.4845]
[10.4877]
```
        env.markers.activate_all();
```

Replacement in crawl-ref/source/dungeon.cc at line 3639 [6.3429798]

∅:D[22.818] → [23.8909:8976]

B:BD[23.8909] → [23.8909:8976]

                env_remove_markers_at(coord_def(vx, vy), MAT_ANY);

[22.818]

[23.8976]

                env.markers.remove_markers_at(coord_def(vx, vy), MAT_ANY);

Replacement in crawl-ref/source/dungeon.cc at line 5718 [6.3429798]

B:BD[15.2686] → [15.2686:2761]

        env_add_marker(new map_feature_marker(pos, DNGN_ENTER_LABYRINTH));

[15.2686]

[15.2761]

        env.markers.add(new map_feature_marker(pos, DNGN_ENTER_LABYRINTH));

Replacement in crawl-ref/source/dungeon.cc at line 6885 [6.3429798]

B:BD[15.2862] → [15.2862:2924]

    std::vector<map_marker*> markers = env_get_all_markers();

[15.2862]

[15.2924]

    std::vector<map_marker*> markers = env.markers.get_all();

Replacement in crawl-ref/source/direct.cc at line 1479 [6.3697945]

B:BD[12.8570] → [12.8570:8629]

    std::vector<map_marker*> markers = env_get_markers(p);

[12.8570]

[12.8629]

    std::vector<map_marker*> markers = env.markers.get_markers_at(p);

Replacement in crawl-ref/source/direct.cc at line 1754 [6.3697945]

B:BD[5.20897] → [8.41134:41206]

    if (map_marker *mark = env_find_marker(coord_def(mx, my), MAT_ANY))

[5.20897]

[14.24537]

    if (map_marker *mark = env.markers.find(coord_def(mx, my), MAT_ANY))

Replacement in crawl-ref/source/acr.cc at line 245 [6.4397395]
B:BD[8.50206] → [8.50206:50238]
```
        env_activate_markers();
```
[8.50206]
[6.4405216]
```
        env.markers.activate_all();
```

Replacement in crawl-ref/source/abyss.cc at line 380 [6.4482606]

B:BD[2.14361] → [2.14361:14423]

    env_add_marker(new map_corruption_marker(pos, duration));

[2.14361]

[2.14423]

    env.markers.add(new map_corruption_marker(pos, duration));

Replacement in crawl-ref/source/abyss.cc at line 401 [6.4482606]

B:BD[2.15005] → [2.15005:15057]

               || env_find_marker(where, MAT_ANY));

[2.15005]

[2.15057]

               || env.markers.find(where, MAT_ANY));

Replacement in crawl-ref/source/abyss.cc at line 456 [6.4482606]
B:BD[2.16669] → [2.16669:16703]
```
        env_remove_marker(cmark);
```
[2.16669]
[2.16703]
```
        env.markers.remove(cmark);
```

Replacement in crawl-ref/source/abyss.cc at line 462 [6.4482606]

B:BD[2.16789] → [2.16789:16840]

        env_get_all_markers(MAT_CORRUPTION_NEXUS);

[2.16789]

[2.16840]

        env.markers.get_all(MAT_CORRUPTION_NEXUS);

Replacement in crawl-ref/source/abyss.cc at line 584 [6.4482606]

B:BD[2.19802] → [2.19802:19853]

        env_get_all_markers(MAT_CORRUPTION_NEXUS);

[2.19802]

[2.19853]

        env.markers.get_all(MAT_CORRUPTION_NEXUS);

Replacement in crawl-ref/source/abyss.cc at line 619 [6.4482606]

B:BD[2.20878] → [2.20878:20932]

    return (!!env_find_marker(MAT_CORRUPTION_NEXUS));

[2.20878]

[2.20932]

    return (!!env.markers.find(MAT_CORRUPTION_NEXUS));

Fixed map marker crashes.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.cc at line 2491 [4.39949]

Insertion in crawl-ref/source/travel.cc at line 2494 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 2500 [4.39949]

Replacement in crawl-ref/source/tags.cc at line 1432 [6.164589]

Replacement in crawl-ref/source/tags.cc at line 1657 [6.164589]

Replacement in crawl-ref/source/monplace.cc at line 877 [6.1641732]

Replacement in crawl-ref/source/misc.cc at line 536 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 553 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 859 [6.1933596]

Insertion in crawl-ref/source/message.cc at line 673 [6.1993826]

Deletion in crawl-ref/source/mapmark.h at line 12 [8.10602]

Insertion in crawl-ref/source/mapmark.h at line 20 [8.10602]

Insertion in crawl-ref/source/mapmark.h at line 55 [8.10602]

Replacement in crawl-ref/source/mapmark.h at line 72 [8.10602]

Insertion in crawl-ref/source/mapmark.h at line 93 [8.10602]

Replacement in crawl-ref/source/mapmark.h at line 99 [8.10602]

Deletion in crawl-ref/source/mapmark.h at line 113 [8.10602]

Insertion in crawl-ref/source/mapmark.cc at line 120 [8.13502]

Insertion in crawl-ref/source/mapmark.cc at line 184 [8.13502]

Insertion in crawl-ref/source/mapmark.cc at line 411 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 426 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 432 [8.13502]

Insertion in crawl-ref/source/mapmark.cc at line 455 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 468 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 470 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 473 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 476 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 481 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 488 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 492 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 499 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 504 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 507 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 514 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 516 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 525 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 528 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 530 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 534 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 538 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 542 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 546 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 549 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 558 [8.13502]

Replacement in crawl-ref/source/mapmark.cc at line 561 [8.13502]