fiddlerwoaroof/crawl - Change IVVTHLTTLOP5TSULXJWUSSXHOKYWVU3OWKYVK45A7RIB6V34MYQAC

[1742338] Fixed Hell portals not being revealed correctly when the horn is

sounded.

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

Created by dshaligram on June 30, 2007

IVVTHLTTLOP5TSULXJWUSSXHOKYWVU3OWKYVK45A7RIB6V34MYQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 69 [10.75608]

B:BD[8.75] → [9.163:220]

%token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM

[8.75]

[11.123]

%token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER

Insertion in crawl-ref/source/util/levcomp.ypp at line 162 [10.75608]
[12.191]
[13.8]
```
                | marker
```
Deletion in crawl-ref/source/util/levcomp.ypp at line 164 [10.75608]
∅:D[13.32] → [10.77682:77705]
B:BD[10.77682] → [10.77682:77705]
```
                | tags
```
Insertion in crawl-ref/source/util/levcomp.ypp at line 165 [10.75608]
[14.85]
[8.76]
```
                | tags
```

Insertion in crawl-ref/source/util/levcomp.ypp at line 286 [10.75608]

[10.78001]

[13.375]

                ;
marker          : MARKER marker_specs { }
                ;
marker_specs    : marker_spec                       { }
                | marker_specs COMMA marker_spec    { }

Insertion in crawl-ref/source/util/levcomp.ypp at line 295 [10.75608]

[13.394]

marker_spec     : ITEM_INFO
                {
                    lc_map.main.add(
                        yylineno,
                        make_stringf("marker(\"%s\")",
                            quote_lua_string($1).c_str()));
                }
                ;

Replacement in crawl-ref/source/util/levcomp.ypp at line 324 [10.75608]
B:BD[12.298] → [12.298:353]
```
item_specifiers : item_specifier COMMA item_specifiers
```
[12.298]
[12.353]
```
item_specifiers : item_specifiers COMMA item_specifier
```
Insertion in crawl-ref/source/util/levcomp.lpp at line 180 [10.81193]
[12.2114]
[13.944]
```
MARKER:             { BEGIN(ITEM_LIST); return MARKER; }
```

Deletion in crawl-ref/source/travel.cc at line 2627 [15.39949]

B:BD[15.110313] → [15.110313:110546]


static void writeCoord(FILE *file, const coord_def &pos)
{
    writeShort(file, pos.x);
    writeShort(file, pos.y);
}
static void readCoord(FILE *file, coord_def &pos)
{
    pos.x = readShort(file);
    pos.y = readShort(file);
}

Insertion in crawl-ref/source/tags.h at line 43 [16.161012]
[10.98852]
[16.162404]
```
void marshallCoord(tagHeader &th, const coord_def &c);
```
Insertion in crawl-ref/source/tags.h at line 56 [16.161012]
[17.77]
[16.162909]
```
void unmarshallCoord(tagHeader &th, coord_def &c);
```
Insertion in crawl-ref/source/tags.cc at line 74 [16.164589]
[18.2231]
[16.167424]
```
#include "dungeon.h"
```

Replacement in crawl-ref/source/tags.cc at line 275 [16.164589]

B:BD[19.2765] → [19.2765:2872]

template<typename key, typename value>
void unmarshallMap(struct tagHeader& th, std::map<key,value>& data,

[19.2765]

[20.751]

template<typename key, typename value, typename map>
void unmarshallMap(struct tagHeader& th, map& data,

Replacement in crawl-ref/source/tags.cc at line 285 [16.164589]

B:BD[19.3137] → [20.869:909]

        data[k] = value_unmarshall(th);

[19.3137]

[19.3192]

        std::pair<key, value> p(k, value_unmarshall(th));
        data.insert(p);

Insertion in crawl-ref/source/tags.cc at line 312 [16.164589]

[19.3685]

}
void marshallCoord(tagHeader &th, const coord_def &c)
{
    marshallShort(th, c.x);
    marshallShort(th, c.y);
}
void unmarshallCoord(tagHeader &th, coord_def &c)
{
    c.x = unmarshallShort(th);
    c.y = unmarshallShort(th);

Deletion in crawl-ref/source/tags.cc at line 1287 [16.164589]
B:BD[16.203704] → [16.203704:203742]
```
    int i;
    int count_x, count_y;
```
Replacement in crawl-ref/source/tags.cc at line 1297 [16.164589]
∅:D[3.178] → [16.203902:203950]
B:BD[16.203902] → [16.203902:203950]
```
    for (count_x = 0; count_x < GXM; count_x++)
```
[3.178]
[16.203950]
```
    for (int count_x = 0; count_x < GXM; count_x++)
```
Replacement in crawl-ref/source/tags.cc at line 1299 [16.164589]
B:BD[16.203956] → [16.203956:204008]
```
        for (count_y = 0; count_y < GYM; count_y++)
```
[16.203956]
[16.204008]
```
        for (int count_y = 0; count_y < GYM; count_y++)
```
Replacement in crawl-ref/source/tags.cc at line 1313 [16.164589]
B:BD[16.204301] → [16.204301:204338]
```
    for (i = 0; i < MAX_CLOUDS; i++)
```
[16.204301]
[16.204338]
```
    for (int i = 0; i < MAX_CLOUDS; i++)
```
Replacement in crawl-ref/source/tags.cc at line 1324 [16.164589]
B:BD[16.204575] → [16.204575:204603]
```
    for (i = 0; i < 5; i++)
```
[16.204575]
[16.204603]
```
    for (int i = 0; i < 5; i++)
```

Insertion in crawl-ref/source/tags.cc at line 1335 [16.164589]

[16.204993]

[20.2813]


    // 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);
    }

Insertion in crawl-ref/source/tags.cc at line 1558 [16.164589]

[16.209254]


    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);
    }

Insertion in crawl-ref/source/stuff.cc at line 1082 [16.224557]

[21.347]

[10.116542]

}
//////////////////////////////////////////////////////////////////////////
// crawl_environment
void crawl_environment::add_marker(map_marker *marker)
{
    markers.insert(dgn_pos_marker(marker->pos, marker));
}
void crawl_environment::remove_marker(map_marker *marker)
{
    std::pair<dgn_marker_map::iterator, dgn_marker_map::iterator>
        els = markers.equal_range(marker->pos);
    for (dgn_marker_map::iterator i = els.first; i != els.second; ++i)
    {
        if (i->second == marker)
        {
            markers.erase(i);
            break;
        }
    }
    delete marker;

Insertion in crawl-ref/source/stuff.cc at line 1107 [16.224557]

[21.349]

void crawl_environment::remove_markers_at(const coord_def &c)
{
    std::pair<dgn_marker_map::iterator, dgn_marker_map::iterator>
        els = markers.equal_range(c);
    for (dgn_marker_map::iterator i = els.first; i != els.second; )
    {
        dgn_marker_map::iterator todel = i++;
        delete todel->second;
        markers.erase(todel);
    }
}
map_marker *crawl_environment::find_marker(const coord_def &c,
                                           map_marker_type type) const
{
    std::pair<dgn_marker_map::const_iterator, dgn_marker_map::const_iterator>
        els = markers.equal_range(c);
    for (dgn_marker_map::const_iterator i = els.first; i != els.second; )
        if (type == MAT_ANY || i->second->get_type() == type)
            return (i->second);
    return (NULL);
}
std::vector<map_marker*> crawl_environment::get_markers(const coord_def &c)
    const
{
    std::pair<dgn_marker_map::const_iterator, dgn_marker_map::const_iterator>
        els = markers.equal_range(c);
    std::vector<map_marker*> rmarkers;
    for (dgn_marker_map::const_iterator i = els.first; i != els.second; )
        rmarkers.push_back(i->second);
    return (rmarkers);
}
void crawl_environment::clear_markers()
{
    for (dgn_marker_map::iterator i = markers.begin(); i != markers.end(); ++i)
        delete i->second;
    markers.clear();
}

Replacement in crawl-ref/source/notes.cc at line 116 [10.370339]
B:BD[10.373799] → [10.373799:373838]
B:BD[10.373838] → [22.6920:6960]
```
    if ( note.type == NOTE_GET_ITEM ||
         note.type == NOTE_MP_CHANGE ||
```
[10.373799]
[22.6960]
```
    if ( note.type == NOTE_MP_CHANGE ||
```
Insertion in crawl-ref/source/notes.cc at line 179 [10.370339]
[22.8073]
[22.8073]
```
        case NOTE_GET_ITEM:
```

Replacement in crawl-ref/source/notes.cc at line 193 [10.370339]

∅:D[22.8569] → [10.375829:376045]

B:BD[10.375829] → [10.375829:376045]

          mpr("Buggy note passed: unknown note type");
          // Return now, rather than give a "Buggy note passed" message
          // for each note of the matching type in the note list.
          return true;

[22.8569]

[10.376045]

            mpr("Buggy note passed: unknown note type");
            // Return now, rather than give a "Buggy note passed" message
            // for each note of the matching type in the note list.
            return true;

Replacement in crawl-ref/source/notes.cc at line 343 [10.370339]
∅:D[23.548] → [24.910:955]
B:BD[24.910] → [24.910:955]
```
    if (type == NOTE_DUNGEON_LEVEL_CHANGE) {
```
[23.548]
[24.955]
```
    if (type == NOTE_DUNGEON_LEVEL_CHANGE)
    {
```

Replacement in crawl-ref/source/message.cc at line 88 [16.1993826]

B:BD[25.2192] → [25.2192:2247]

        internal_count(0), muted(false), channel(chan)

[25.2192]

[25.2247]

        internal_count(0), param(0), muted(false), channel(chan)

Replacement in crawl-ref/source/maps.cc at line 78 [16.2007666]

B:BD[16.2020608] → [16.2020608:2020711]

    // NB - a return value of zero is not handled well by dungeon.cc (but there it is) 10mar2000 {dlb}

[16.2015756]

[26.831]

    // Return value of zero forces dungeon.cc to regenerate the level, except
    // for branch entry vaults where dungeon.cc just rejects the vault and
    // places a vanilla entry.

Replacement in crawl-ref/source/maps.cc at line 82 [16.2007666]
∅:D[27.514] → [16.2020779:2020810]
∅:D[26.898] → [16.2020779:2020810]
∅:D[10.584809] → [16.2020779:2020810]
B:BD[16.2020779] → [16.2020779:2020810]
```
}          // end vault_main()
```
[26.898]
[16.2139583]
```
}
```
Replacement in crawl-ref/source/maps.cc at line 123 [16.2007666]
∅:D[6.668] → [14.121697:121716]
∅:D[9.5699] → [14.121697:121716]
B:BD[16.2145665] → [14.121697:121716]
```
    map.resolve();
```
[6.668]
[11.2555]
```
    err = map.resolve();
    if (!err.empty())
    {
        mprf(MSGCH_WARN, "Error: %s", err.c_str());
        return (false);
    }
```
Replacement in crawl-ref/source/mapdef.h at line 81 [10.591249]
B:BD[9.6349] → [9.6349:6366]
```
        TT_SUBST
```
[9.6349]
[9.6366]
```
        TT_SUBST,
        TT_MARKER
```

Replacement in crawl-ref/source/mapdef.h at line 87 [10.591249]

B:BD[28.184] → [28.184:238]

    virtual void apply_transform(map_lines &map) = 0;

[28.184]

[28.238]

    virtual std::string apply_transform(map_lines &map) = 0;

Replacement in crawl-ref/source/mapdef.h at line 105 [10.591249]
B:BD[28.338] → [28.338:380]
```
    void apply_transform(map_lines &map);
```
[28.338]
[28.380]
```
    std::string apply_transform(map_lines &map);
```
Replacement in crawl-ref/source/mapdef.h at line 129 [10.591249]
B:BD[28.577] → [28.577:619]
```
    void apply_transform(map_lines &map);
```
[28.577]
[28.619]
```
    std::string apply_transform(map_lines &map);
```

Insertion in crawl-ref/source/mapdef.h at line 139 [10.591249]

[29.1129]

[27.694]

struct map_feat_marker_spec : public map_transformer
{
    int key;
    dungeon_feature_type feat;
    map_feat_marker_spec(int _key, dungeon_feature_type _feat)
        : key(_key), feat(_feat) { }
    std::string apply_transform(map_lines &map);
    transform_type type() const;
    std::string describe() const;
    map_transformer *clone() const;
};

Insertion in crawl-ref/source/mapdef.h at line 168 [10.591249]
[9.6925]
[29.1231]
```
    void clear_markers();
```

Insertion in crawl-ref/source/mapdef.h at line 170 [10.591249]

[29.1232]

[10.592273]

    std::vector<coord_def> find_glyph(int glyph) const;
    coord_def find_first_glyph(int glyph) const;

Replacement in crawl-ref/source/mapdef.h at line 183 [10.591249]
B:BD[28.758] → [28.758:787]
```
    void apply_transforms();
```
[28.758]
[10.592416]
```
    std::string apply_transforms();
```

Insertion in crawl-ref/source/mapdef.h at line 195 [10.591249]

[10.592647]

    void add_marker(map_marker *marker);
    std::string add_feature_marker(const std::string &desc);
    void apply_markers(const coord_def &pos);

Replacement in crawl-ref/source/mapdef.h at line 207 [10.591249]

B:BD[28.830] → [28.830:861]

    void release_transforms();

[28.830]

[28.861]

    void clear_transforms();
    template <typename V> void clear_vector(V &vect);
    void vmirror_markers();
    void hmirror_markers();
    void rotate_markers(bool clock);
    void vmirror_marker(map_marker *, int par);
    void hmirror_marker(map_marker *, int par);
    void rotate_marker(map_marker *, int par);
    void translate_marker(void (map_lines::*xform)(map_marker *, int par),
                          int par = 0);

Insertion in crawl-ref/source/mapdef.h at line 236 [10.591249]
[28.1011]
[10.592781]
```
    std::vector<map_marker *> markers;
```
Replacement in crawl-ref/source/mapdef.h at line 501 [10.591249]
B:BD[10.593675] → [10.593675:593695]
```
    void resolve();
```
[10.593675]
[10.593695]
```
    std::string resolve();
```

Replacement in crawl-ref/source/mapdef.cc at line 340 [10.594797]

B:BD[30.140625] → [28.1310:1373]

    : transforms(), lines(), map_width(0), solid_north(false),

[30.140625]

[28.1373]

    : transforms(), markers(), lines(), map_width(0), solid_north(false),

Replacement in crawl-ref/source/mapdef.cc at line 365 [10.594797]
B:BD[28.1690] → [28.1690:1716]
```
    release_transforms();
```
[28.1690]
[28.1716]
```
    clear_transforms();
    clear_markers();
```
Replacement in crawl-ref/source/mapdef.cc at line 371 [10.594797]
B:BD[28.1769] → [28.1769:1795]
```
    release_transforms();
```
[28.1769]
[28.1795]
```
    clear_transforms();
    clear_markers();
```

Insertion in crawl-ref/source/mapdef.cc at line 383 [10.594797]

[28.2172]


    for (int i = 0, size = map.markers.size(); i < size; ++i)
        markers.push_back( map.markers[i]->clone() );

Replacement in crawl-ref/source/mapdef.cc at line 388 [10.594797]

B:BD[28.2175] → [28.2175:2212]

void map_lines::release_transforms()

[28.2175]

[10.595828]

template <typename V>
void map_lines::clear_vector(V &vect)
{
    for (int i = 0, size = vect.size(); i < size; ++i)
        delete vect[i];
    vect.clear();
}
void map_lines::clear_transforms()
{
    clear_vector(transforms);
}
void map_lines::clear_markers()
{
    clear_vector(markers);
}
void map_lines::add_marker(map_marker *marker)
{
    markers.push_back(marker);
}
std::string map_lines::add_feature_marker(const std::string &s)
{
    std::string arg;
    int key = 0, sep = 0;
    std::string err = split_key_item(s, &key, &sep, &arg);
    if (!err.empty())
        return (err);
    const dungeon_feature_type feat = dungeon_feature_by_name(arg);
    if (feat == DNGN_UNSEEN)
        return make_stringf("unknown feature: %s", arg.c_str());
    transforms.push_back(new map_feat_marker_spec(key, feat));    
    return ("");
}
void map_lines::apply_markers(const coord_def &c)

Replacement in crawl-ref/source/mapdef.cc at line 429 [10.594797]

B:BD[10.595830] → [28.2213:2328]

    for (int i = 0, size = transforms.size(); i < size; ++i)
        delete transforms[i];
    transforms.clear();

[10.595830]

[10.595981]

    for (int i = 0, size = markers.size(); i < size; ++i)
    {
        markers[i]->pos += c;
        env.add_marker(markers[i]);
    }
    // *not* clear_markers() since we've offloaded marker ownership to
    // the crawl env.
    markers.clear();

Replacement in crawl-ref/source/mapdef.cc at line 692 [10.594797]
B:BD[10.596358] → [28.2453:2479]
```
    release_transforms();
```
[10.596358]
[10.596358]
```
    clear_transforms();
    clear_markers();
```
Replacement in crawl-ref/source/mapdef.cc at line 768 [10.594797]
B:BD[14.123677] → [28.2611:2646]
```
void map_lines::apply_transforms()
```
[14.123677]
[14.123752]
```
std::string map_lines::apply_transforms()
```
Insertion in crawl-ref/source/mapdef.cc at line 770 [10.594797]
[14.123754]
[28.2647]
```
    std::string error;
```

Replacement in crawl-ref/source/mapdef.cc at line 772 [10.594797]

B:BD[28.2708] → [28.2708:2755]

        transforms[i]->apply_transform(*this);

[28.2708]

[2.100]

    {
        error = transforms[i]->apply_transform(*this);
        if (!error.empty())
            return (error);
    }

Replacement in crawl-ref/source/mapdef.cc at line 779 [10.594797]
B:BD[2.159] → [2.159:185]
```
    release_transforms();
```
[2.159]
[14.123927]
```
    clear_transforms();
    return ("");
```
Replacement in crawl-ref/source/mapdef.cc at line 821 [10.594797]
B:BD[10.597873] → [10.597873:597895]
```
    lines = newlines;
```
[10.597873]
[30.142204]
```
    lines     = newlines;
    rotate_markers(clockwise);
    solid_checked = false;
}
```

Replacement in crawl-ref/source/mapdef.cc at line 826 [10.594797]

B:BD[30.142205] → [30.142205:142232]

    solid_checked = false;

[30.142205]

[10.597895]

void map_lines::translate_marker(
    void (map_lines::*xform)(map_marker *, int),
    int par)
{
    for (int i = 0, size = markers.size(); i < size; ++i)
        (this->*xform)(markers[i], par);
}
void map_lines::vmirror_marker(map_marker *marker, int)
{
    marker->pos.y = height() - 1 - marker->pos.y;
}
void map_lines::hmirror_marker(map_marker *marker, int)
{
    marker->pos.x = width() - 1 - marker->pos.x;
}
void map_lines::rotate_marker(map_marker *marker, int clockwise)
{
    const coord_def c = marker->pos;
    if (clockwise)
        marker->pos = coord_def(width() - 1 - c.y, c.x);
    else
        marker->pos = coord_def(c.y, height() - 1 - c.x);
}
void map_lines::vmirror_markers()
{
    translate_marker(&map_lines::vmirror_marker);
}
void map_lines::hmirror_markers()
{
    translate_marker(&map_lines::hmirror_marker);

Insertion in crawl-ref/source/mapdef.cc at line 863 [10.594797]

[10.597898]

void map_lines::rotate_markers(bool clock)
{
    translate_marker(&map_lines::rotate_marker, clock);
}

Replacement in crawl-ref/source/mapdef.cc at line 879 [10.594797]
B:BD[10.598161] → [30.142233:142234]
[10.598161]
[30.142234]
```
    vmirror_markers();
```
Replacement in crawl-ref/source/mapdef.cc at line 896 [10.594797]
B:BD[10.598503] → [30.142262:142263]
[10.598503]
[30.142263]
```
    hmirror_markers();
```

Insertion in crawl-ref/source/mapdef.cc at line 918 [10.594797]

[10.598506]

std::vector<coord_def> map_lines::find_glyph(int gly) const
{
    std::vector<coord_def> points;
    for (int y = height() - 1; y >= 0; --y)
    {
        for (int x = width() - 1; x >= 0; --x)
        {
            const coord_def c(x, y);
            if ((*this)(c) == gly)
                points.push_back(c);
        }
    }
    return (points);
}
coord_def map_lines::find_first_glyph(int gly) const
{
    for (int y = 0, h = height(); y < h; ++y)
    {
        for (int x = 0, w = width(); x < w; ++x)
        {
            const coord_def c(x, y);
            if ((*this)(c) == gly)
                return (c);
        }
    }
    return coord_def(-1, -1);
}

Replacement in crawl-ref/source/mapdef.cc at line 1055 [10.594797]

B:BD[31.2637] → [31.2637:2931]

    std::vector<coord_def> points;
    for (int y = map.height() - 1; y >= 0; --y)
    {
        for (int x = map.width() - 1; x >= 0; --x)
        {
            const coord_def c(x, y);
            if (map(c) == glyph)
                points.push_back(c);
        }
    }
    return (points);

[31.2637]

[31.2931]

    return map.find_glyph(glyph);

Replacement in crawl-ref/source/mapdef.cc at line 1060 [10.594797]

B:BD[31.2989] → [31.2989:3271]

    for (int y = 0, height = map.height(); y < height; ++y)
    {
        for (int x = 0, width = map.width(); x < width; ++x)
        {
            const coord_def c(x, y);
            if (map(c) == glyph)
                return (c);
        }
    }
    return coord_def(-1, -1);

[31.2989]

[31.3271]

    return map.find_first_glyph(glyph);

Replacement in crawl-ref/source/mapdef.cc at line 1231 [10.594797]
B:BD[9.14766] → [9.14766:14783]
```
    return ("");
```
[9.14766]
[9.14783]
```
    return (map.apply_transforms());
```
Replacement in crawl-ref/source/mapdef.cc at line 1473 [10.594797]
B:BD[10.601753] → [10.601753:601777]
```
void map_def::resolve()
```
[10.601753]
[10.601777]
```
std::string map_def::resolve()
```
Replacement in crawl-ref/source/mapdef.cc at line 1475 [10.594797]
B:BD[10.601779] → [28.2756:2784]
```
    map.apply_transforms();
```
[10.601779]
[10.601814]
```
    return map.apply_transforms();
```
Replacement in crawl-ref/source/mapdef.cc at line 2091 [10.594797]
B:BD[28.2860] → [28.2860:2909]
```
void subst_spec::apply_transform(map_lines &map)
```
[28.2860]
[28.2909]
```
std::string subst_spec::apply_transform(map_lines &map)
```
Insertion in crawl-ref/source/mapdef.cc at line 2094 [10.594797]
[28.2933]
[28.2933]
```
    return ("");
```
Replacement in crawl-ref/source/mapdef.cc at line 2141 [10.594797]
B:BD[28.3110] → [28.3110:3161]
```
void shuffle_spec::apply_transform(map_lines &map)
```
[28.3110]
[28.3161]
```
std::string shuffle_spec::apply_transform(map_lines &map)
```
Insertion in crawl-ref/source/mapdef.cc at line 2144 [10.594797]
[28.3197]
[29.5617]
```
    return ("");
```

Insertion in crawl-ref/source/mapdef.cc at line 2160 [10.594797]

[9.17059]

[28.3281]

}
//////////////////////////////////////////////////////////////////////////
// map_feat_marker_spec
std::string map_feat_marker_spec::apply_transform(map_lines &map)
{
    std::vector<coord_def> positions = map.find_glyph(key);
    if (positions.size() == 1)
    {
        map.add_marker(new map_feature_marker(positions[0], feat));
        return ("");
    }
    else if (positions.empty())
        return make_stringf("cant find key '%c' for marker", key);
    else
        return make_stringf("too many matches for key '%c' for marker", key);
}
map_transformer::transform_type map_feat_marker_spec::type() const
{
    return (TT_MARKER);
}
std::string map_feat_marker_spec::describe() const
{
    return map_feature_marker(coord_def(), feat).describe();

Insertion in crawl-ref/source/mapdef.cc at line 2189 [10.594797]

[28.3284]

[8.6171]

map_transformer *map_feat_marker_spec::clone() const
{
    return new map_feat_marker_spec(key, feat);
}

Insertion in crawl-ref/source/luadgn.h at line 68 [32.228]

[31.3450]

dungeon_feature_type dungeon_feature_by_name(const std::string &name);
const char *dungeon_feature_name(dungeon_feature_type feat);

Insertion in crawl-ref/source/luadgn.cc at line 601 [32.1232]

[32.11615]

    return (0);
}
static int dgn_marker(lua_State *ls)
{
    MAP(ls, 1, map);
    if (lua_gettop(ls) == 1)
        return (0);
    if (lua_isnil(ls, 2))
    {
        map->map.clear_markers();
        return (0);
    }
    if (lua_isstring(ls, 2))
    {
        std::string err = map->map.add_feature_marker(luaL_checkstring(ls, 2));
        if (!err.empty())
            luaL_error(ls, err.c_str());
        return (0);
    }
    
    const coord_def pos(luaL_checkint(ls, 2), luaL_checkint(ls, 3));
    dungeon_feature_type feat = DNGN_UNSEEN;
    if (lua_isnumber(ls, 4))
        feat = static_cast<dungeon_feature_type>( luaL_checkint(ls, 4) );
    else
        feat = dungeon_feature_by_name( luaL_checkstring(ls, 4) );
    map->map.add_marker( new map_feature_marker(pos, feat) );

Insertion in crawl-ref/source/luadgn.cc at line 769 [32.1232]

[7.690]

[31.5367]

}
const char *dngn_feature_names[] =
{
    "unseen", "rock_wall", "stone_wall", "closed_door", "metal_wall",
    "secret_door", "green_crystal_wall", "orcish_idol", "wax_wall",
    "permarock_wall", "", "", "", "", "", "", "", "", "", "", "",
    "silver_statue", "granite_statue", "orange_crystal_statue",
    "statue_reserved_1", "statue_reserved_2", "", "", "", "", "", "", "", "",
    "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
    "", "", "", "", "", "", "", "", "lava", "deep_water", "", "",
    "shallow_water", "water_stuck", "floor", "exit_hell", "enter_hell",
    "open_door", "", "", "", "", "trap_mechanical", "trap_magical", "trap_iii",
    "undiscovered_trap", "", "enter_shop", "enter_labyrinth",
    "stone_stairs_down_i", "stone_stairs_down_ii", "stone_stairs_down_iii",
    "rock_stairs_down", "stone_stairs_up_i", "stone_stairs_up_ii",
    "stone_stairs_up_iii", "rock_stairs_up", "", "", "enter_dis",
    "enter_gehenna", "enter_cocytus", "enter_tartarus", "enter_abyss",
    "exit_abyss", "stone_arch", "enter_pandemonium", "exit_pandemonium",
    "transit_pandemonium", "", "", "", "builder_special_wall",
    "builder_special_floor", "", "", "", "enter_orcish_mines", "enter_hive",
    "enter_lair", "enter_slime_pits", "enter_vaults", "enter_crypt",
    "enter_hall_of_blades", "enter_zot", "enter_temple", "enter_snake_pit",
    "enter_elven_halls", "enter_tomb", "enter_swamp", "enter_shoals",
    "enter_reserved_2", "enter_reserved_3", "enter_reserved_4", "", "", "",
    "return_from_orcish_mines", "return_from_hive", "return_from_lair",
    "return_from_slime_pits", "return_from_vaults", "return_from_crypt",
    "return_from_hall_of_blades", "return_from_zot", "return_from_temple",
    "return_from_snake_pit", "return_from_elven_halls", "return_from_tomb",
    "return_from_swamp", "return_from_shoals", "return_reserved_2",
    "return_reserved_3", "return_reserved_4", "", "", "", "", "", "", "", "",
    "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
    "", "", "", "", "", "", "altar_zin", "altar_shining_one",
    "altar_kikubaaqudgha", "altar_yredelemnul", "altar_xom", "altar_vehumet",
    "altar_okawaru", "altar_makhleb", "altar_sif_muna", "altar_trog",
    "altar_nemelex_xobeh", "altar_elyvilon", "altar_lugonu", "altar_beogh", "",
    "", "", "", "", "", "blue_fountain", "dry_fountain_i",
    "sparkling_fountain", "dry_fountain_ii", "dry_fountain_iii",
    "dry_fountain_iv", "dry_fountain_v", "dry_fountain_vi", "dry_fountain_vii",
    "dry_fountain_viii", "permadry_fountain"
};
dungeon_feature_type dungeon_feature_by_name(const std::string &name)
{
    ASSERT(ARRAYSIZE(dngn_feature_names) == NUM_REAL_FEATURES);
    if (name.empty())
        return (DNGN_UNSEEN);
    for (unsigned i = 0; i < ARRAYSIZE(dngn_feature_names); ++i)
        if (dngn_feature_names[i] == name)
            return static_cast<dungeon_feature_type>(i);
    return (DNGN_UNSEEN);
}
const char *dungeon_feature_name(dungeon_feature_type rfeat)
{
    const unsigned feat = rfeat;
    
    if (feat >= ARRAYSIZE(dngn_feature_names))
        return (NULL);
    return dngn_feature_names[feat];

Insertion in crawl-ref/source/luadgn.cc at line 834 [32.1232]

[31.5370]

[32.12243]

static int dgn_feature_number(lua_State *ls)
{
    const std::string &name = luaL_checkstring(ls, 1);
    PLUARET(number, dungeon_feature_by_name(name));
}
static int dgn_feature_name(lua_State *ls)
{
    const unsigned feat = luaL_checkint(ls, 1);
    PLUARET(string,
            dungeon_feature_name(static_cast<dungeon_feature_type>(feat)));
}

Insertion in crawl-ref/source/luadgn.cc at line 865 [32.1232]
[32.12767]
[32.12767]
```
    { "marker", dgn_marker },
```

Insertion in crawl-ref/source/luadgn.cc at line 877 [32.1232]

[7.735]

[32.12851]

    { "feature_number", dgn_feature_number },
    { "feature_name", dgn_feature_name },

Replacement in crawl-ref/source/libunix.cc at line 233 [16.2550041]
B:BD[4.5978] → [4.5978:6005]
```
    mousemask(mask, NULL);
```
[4.5978]
[4.6005]
```
    mmask_t oldmask = 0;
    mousemask(mask, &oldmask);
```
Insertion in crawl-ref/source/items.cc at line 55 [16.2584728]
[16.2585825]
[33.5401]
```
#include "notes.h"
```

Insertion in crawl-ref/source/items.cc at line 848 [16.2584728]

[24.4267]

[15.346034]

static void check_note_item(const item_def &item)
{
    if (is_interesting_item(item))
        take_note(Note(NOTE_GET_ITEM, 0, 0, item.name(DESC_NOCAP_A).c_str(),
                       origin_desc(item).c_str()));
}

Replacement in crawl-ref/source/items.cc at line 868 [16.2584728]
B:BD[15.346456] → [24.4270:4271]
[15.346456]
[23.811]
```
        check_note_item(item);
```
Insertion in crawl-ref/source/items.cc at line 887 [16.2584728]
[15.346815]
[23.834]
```
        check_note_item(item);
```

Replacement in crawl-ref/source/itemname.cc at line 1901 [16.2667494]

∅:D[34.21675] → [10.726894:727026]

B:BD[10.726894] → [10.726894:727026]

    if ( is_random_artefact(item) ||
         is_unrandom_artefact(item) ||
         is_fixed_artefact(item) )
        return true;

[34.21675]

[16.2777144]

    if (fully_identified(item)
        && (is_random_artefact(item) ||
            is_unrandom_artefact(item) ||
            is_fixed_artefact(item)))
        return (true);

Replacement in crawl-ref/source/itemname.cc at line 1910 [16.2667494]
B:BD[10.727243] → [10.727243:727286]
```
            return true;
    return false;
```
[10.727243]
[10.727286]
```
            return (true);
    return (false);
```

Replacement in crawl-ref/source/it_use3.cc at line 573 [16.2870456]

B:BD[10.764346] → [10.764346:764600]

                            // [dshaligram] New approach to placing Hell
                            // portals to handle the possibility of a mirrored
                            // Vestibule.
                            int surround_grid = DNGN_FLOOR;

[10.764346]

[16.2888650]

                            map_marker *marker =
                                env.find_marker(coord_def(count_x, count_y),
                                                MAT_FEATURE);

Replacement in crawl-ref/source/it_use3.cc at line 577 [16.2870456]

B:BD[16.2888651] → [10.764601:765353]

∅:D[10.765353] → [16.2888651:2888725]

B:BD[16.2888651] → [16.2888651:2888725]

B:BD[16.2888725] → [10.765354:765405]

                            for (int y = -1; y <= 1; ++y)
                                for (int x = -1; x <= 1; ++x)
                                {
                                    if (!x && !y)
                                        continue;
                                    const int grid = 
                                        grd[count_x + x][count_y + y];
                                    if (grid != DNGN_FLOOR 
                                            && grid != DNGN_SECRET_DOOR
                                            && grid != DNGN_CLOSED_DOOR
                                            && grid != DNGN_OPEN_DOOR)
                                        surround_grid = grid;
                                }
                            // this may generate faulty [][] values {dlb}
                            switch (surround_grid)

[16.2888651]

[16.2888788]

                            if (marker)

Replacement in crawl-ref/source/it_use3.cc at line 579 [16.2870456]

B:BD[16.2888818] → [16.2888818:2889463]

                            case DNGN_FLOOR:
                                grd[count_x][count_y] = DNGN_ENTER_DIS;
                                break;
                            case DNGN_LAVA:
                                grd[count_x][count_y] = DNGN_ENTER_GEHENNA;
                                break;
                            case DNGN_ROCK_WALL:
                                grd[count_x][count_y] = DNGN_ENTER_TARTARUS;
                                break;
                            case DNGN_DEEP_WATER:
                                grd[count_x][count_y] = DNGN_ENTER_COCYTUS;
                                break;

[16.2888818]

[16.2889463]

                                map_feature_marker *featm =
                                    dynamic_cast<map_feature_marker*>(marker);
                                grd[count_x][count_y] = featm->feat;
                                env.remove_marker(marker);

Insertion in crawl-ref/source/files.h at line 99 [16.3082298]

[15.432424]

void writeCoord(FILE *file, const coord_def &pos);
void readCoord(FILE *file, coord_def &pos);

Insertion in crawl-ref/source/files.cc at line 1678 [16.3084589]

[15.438894]

[17.29148]

}
void writeCoord(FILE *file, const coord_def &pos)
{
    writeShort(file, pos.x);
    writeShort(file, pos.y);
}
void readCoord(FILE *file, coord_def &pos)
{
    pos.x = readShort(file);
    pos.y = readShort(file);

Insertion in crawl-ref/source/externs.h at line 1170 [16.3270163]

[31.6192]

[16.3281637]

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

Insertion in crawl-ref/source/externs.h at line 1176 [16.3270163]
[16.3281664]
[16.3281664]
```
public:
```

Replacement in crawl-ref/source/externs.h at line 1201 [16.3270163]

B:BD[16.3282587] → [16.3282587:3282628]

    FixedVector< int, 20 >   mons_alloc;

[16.3282587]

[16.3282669]

    FixedVector< int, 20 >                   mons_alloc;
    dgn_marker_map                           markers;

Insertion in crawl-ref/source/externs.h at line 1208 [16.3270163]

[3.858]

[16.3282738]


public:
    void add_marker(map_marker *);
    void remove_marker(map_marker *);
    void remove_markers_at(const coord_def &c);
    map_marker *find_marker(const coord_def &c, map_marker_type) const;
    std::vector<map_marker*> get_markers(const coord_def &c) const;
    void clear_markers();

Deletion in crawl-ref/source/enum.h at line 1018 [16.3287960]
B:BD[16.3308535] → [10.911689:911739]
```
    // DNGN_BRANCH_STAIRS,                //   71
```
Insertion in crawl-ref/source/enum.h at line 1112 [16.3287960]
[10.912088]
[10.912088]
```
    NUM_REAL_FEATURES,
```

Insertion in crawl-ref/source/enum.h at line 1740 [16.3287960]

[16.3326904]

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

Insertion in crawl-ref/source/dungeon.h at line 101 [16.3428186]

[31.6640]

[35.1507]


//////////////////////////////////////////////////////////////////////////
// Map markers
class map_marker
{
public:
    map_marker(map_marker_type type, const coord_def &pos);
    virtual ~map_marker();
    map_marker_type get_type() const { return type; }

Insertion in crawl-ref/source/dungeon.h at line 113 [16.3428186]

[35.1508]

[35.1628]

    virtual void write(tagHeader &) const;
    virtual void read(tagHeader &);
    virtual map_marker *clone() const = 0;
    virtual std::string describe() const = 0;
    
    static map_marker *read_marker(tagHeader&);

Insertion in crawl-ref/source/dungeon.h at line 120 [16.3428186]

[35.1629]

[31.6641]

public:
    coord_def pos;
protected:
    map_marker_type type;
    typedef map_marker *(*marker_reader)(tagHeader &, map_marker_type);
    static marker_reader readers[NUM_MAP_MARKER_TYPES];
};
class map_feature_marker : public map_marker
{
public:
    map_feature_marker(const coord_def &pos = coord_def(0, 0),
                       dungeon_feature_type feat = DNGN_UNSEEN);
    map_feature_marker(const map_feature_marker &other);
    void write(tagHeader &) const;
    void read(tagHeader &);
    map_marker *clone() const;
    std::string describe() const;
    static map_marker *read(tagHeader &, map_marker_type);
    
public:
    dungeon_feature_type feat;
};

Insertion in crawl-ref/source/dungeon.cc at line 58 [16.3429798]
[16.3431279]
[36.1556]
```
#include "tags.h"
```
Insertion in crawl-ref/source/dungeon.cc at line 351 [16.3429798]
[16.3436980]
[26.4034]
```
    // clear all markers
    env.clear_markers();
```
Insertion in crawl-ref/source/dungeon.cc at line 2624 [16.3429798]
[5.2716]
[5.2716]
```
    place.map.map.apply_markers(coord_def(v1x, v1y));
```
Insertion in crawl-ref/source/dungeon.cc at line 3012 [16.3429798]
[16.3598813]
[16.3598813]
```
    place.map.map.apply_markers(coord_def(place.x, place.y));
    
```

Insertion in crawl-ref/source/dungeon.cc at line 6252 [16.3429798]

[5.6148]

[30.159071]

}
////////////////////////////////////////////////////////////////////////
// Dungeon markers
map_marker::marker_reader
map_marker::readers[NUM_MAP_MARKER_TYPES] =
{
    &map_feature_marker::read,
};
map_marker::map_marker(map_marker_type t, const coord_def &p)
    : pos(p), type(t)
{
}
map_marker::~map_marker()
{
}
void map_marker::write(tagHeader &outf) const
{
    marshallShort(outf, type);
    marshallCoord(outf, pos);

Insertion in crawl-ref/source/dungeon.cc at line 6277 [16.3429798]

[30.159073]


void map_marker::read(tagHeader &inf)
{
    // Don't read type! The type has to be read by someone who knows how
    // to look up the unmarshall function.
    unmarshallCoord(inf, pos);
}
map_marker *map_marker::read_marker(tagHeader &inf)
{
    const map_marker_type type =
        static_cast<map_marker_type>(unmarshallShort(inf));
    return readers[type]? (*readers[type])(inf, type) : NULL;
}
////////////////////////////////////////////////////////////////////////////
// map_feature_marker
map_feature_marker::map_feature_marker(
    const coord_def &p,
    dungeon_feature_type _feat)
    : map_marker(MAT_FEATURE, p), feat(_feat)
{
}
map_feature_marker::map_feature_marker(
    const map_feature_marker &other)
    : map_marker(MAT_FEATURE, other.pos), feat(other.feat)
{
}
void map_feature_marker::write(tagHeader &outf) const
{
    this->map_marker::write(outf);
    marshallShort(outf, feat);
}
void map_feature_marker::read(tagHeader &inf)
{
    map_marker::read(inf);
    feat = static_cast<dungeon_feature_type>(unmarshallShort(inf));
}
map_marker *map_feature_marker::read(tagHeader &inf, map_marker_type)
{
    map_marker *mapf = new map_feature_marker();
    mapf->read(inf);
    return (mapf);
}
map_marker *map_feature_marker::clone() const
{
    return new map_feature_marker(pos, feat);
}
std::string map_feature_marker::describe() const
{
    return make_stringf("feature (%s)", dungeon_feature_name(feat));
}

Insertion in crawl-ref/source/direct.cc at line 39 [16.3697945]
[16.3698716]
[16.3698716]
```
#include "dungeon.h"
```

Replacement in crawl-ref/source/direct.cc at line 1679 [16.3697945]

B:BD[37.1833] → [38.2225:2262]

    mprf("(%d,%d): %s - %s", mx, my,

[37.1833]

[38.2262]

    std::string marker;
    if (map_marker *mark = env.find_marker(coord_def(mx, my), MAT_ANY))
        marker = " (" + mark->describe() + ")";
    mprf("(%d,%d): %s - %s%s", mx, my,

Replacement in crawl-ref/source/direct.cc at line 1684 [16.3697945]
B:BD[38.2322] → [38.2322:2354]
```
         feature_desc.c_str());
```
[38.2322]
[37.1888]
```
         feature_desc.c_str(),
         marker.c_str());
```

Replacement in crawl-ref/source/describe.cc at line 871 [16.3736416]

B:BD[16.3761460] → [16.3761460:3761539]

                description += "An small axe designed for either hand combat "

[16.3761460]

[16.3761539]

                description += "A small axe designed for either hand combat "

Deletion in crawl-ref/source/describe.cc at line 873 [16.3736416]
B:BD[16.3761587] → [16.3761587:3761656]
```
                               // "It might also make a good tool.";
```

Deletion in crawl-ref/source/dat/splev.des at line 9 [10.1090923]

∅:D[39.12542] → [40.3889:3891]

∅:D[29.13969] → [40.3889:3891]

B:BD[40.3889] → [40.3889:3891]

B:BD[40.3891] → [39.12543:12586]

∅:D[41.12442] → [10.1094957:1094959]

∅:D[39.12586] → [10.1094957:1094959]

B:BD[10.1094957] → [10.1094957:1094959]

B:BD[10.1095626] → [10.1095626:1096124]

#
# If modifying the Vestibule, ensure that:
#
#  * The portal to Dis is surrounded by floor squares and nothing but floor 
#    squares.
#  * The portal to Tartarus is surrounded only by floor, doors of any kind, and
#    at least one rock wall.
#  * The portal to Gehenna is surrounded by nothing but floor and at least one
#    lava square.
#  * The portal to Cocytus is surrounded by nothing but floor and at least one
#    water square.
#
# If you don't do this, the portals will not be unbarred correctly when 
# Geryon's horn is sounded.

Insertion in crawl-ref/source/dat/splev.des at line 13 [10.1090923]

[39.12642]

[39.12674]

MARKER: D=enter_dis, G=enter_gehenna, C=enter_cocytus, T=enter_tartarus
SUBST: D=A, G=A, C=A, T=A

Replacement in crawl-ref/source/dat/splev.des at line 29 [10.1090923]

B:BD[10.1096939] → [10.1096939:1097020]

xxxxxxxxxxxxxxxxxxxxxxxxxx..........v..A..v..........xxxxxxxxxxxxxxxxxxxxxxxxxxx

[10.1096939]

[10.1097020]

xxxxxxxxxxxxxxxxxxxxxxxxxx..........v..D..v..........xxxxxxxxxxxxxxxxxxxxxxxxxxx

Replacement in crawl-ref/source/dat/splev.des at line 53 [10.1090923]

B:BD[10.1098883] → [42.1554:1635]

xxxxxxxxx.l.l.l.A.l.l.................}1].............................=Axxxxxxxx

[10.1098883]

[10.1098964]

xxxxxxxxx.l.l.l.G.l.l.................}1].............................=Txxxxxxxx

Replacement in crawl-ref/source/dat/splev.des at line 77 [10.1090923]

B:BD[10.1100827] → [10.1100827:1100908]

xxxxxxxxxxxxxxxxxxxxxxxxxx...wwwwwwwwwwAwwwwwwwwwwwwwxxxxxxxxxxxxxxxxxxxxxxxxxxx

[10.1100827]

[10.1100908]

xxxxxxxxxxxxxxxxxxxxxxxxxx...wwwwwwwwwwCwwwwwwwwwwwwwxxxxxxxxxxxxxxxxxxxxxxxxxxx

Deletion in crawl-ref/source/dat/splev.des at line 91 [10.1090923]
∅:D[43.3945] → [10.1101873:1101874]
B:BD[10.1101873] → [10.1101873:1101874]

Replacement in crawl-ref/source/dat/levdes.vim at line 51 [10.1183087]

B:BD[29.14535] → [8.17176:17299]

syn keyword desDeclarator NAME: ORIENT: DEPTH: PLACE: MONS: FLAGS: default-depth: TAGS: CHANCE: ITEM: KFEAT: KMONS: KITEM:

[29.14535]

[29.14637]

syn keyword desDeclarator NAME: ORIENT: DEPTH: PLACE: MONS: FLAGS: default-depth: TAGS: CHANCE: ITEM: KFEAT: KMONS: KITEM: MARKER:

Replacement in crawl-ref/docs/level-design.txt at line 302 [45.350]

B:BD[44.4537] → [44.4537:4667]

         You can apply multiple constraints (with multiple DEPTH: lines, if
         necessary, or on one line, comma-separated):

[44.4537]

[44.4667]

         You can apply multiple constraints in one DEPTH line,
         comma-separated:

Replacement in crawl-ref/docs/level-design.txt at line 536 [45.350]

B:BD[6.3409] → [6.3409:3475]

Crawl translated level (.des) files into Lua code chunks and runs

[6.3409]

[6.3475]

Crawl translates level (.des) files into Lua code chunks and runs

[1742338] Fixed Hell portals not being revealed correctly when the horn is

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 69 [10.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 162 [10.75608]

Deletion in crawl-ref/source/util/levcomp.ypp at line 164 [10.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 165 [10.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 286 [10.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 295 [10.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 324 [10.75608]

Insertion in crawl-ref/source/util/levcomp.lpp at line 180 [10.81193]

Deletion in crawl-ref/source/travel.cc at line 2627 [15.39949]

Insertion in crawl-ref/source/tags.h at line 43 [16.161012]

Insertion in crawl-ref/source/tags.h at line 56 [16.161012]

Insertion in crawl-ref/source/tags.cc at line 74 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 275 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 285 [16.164589]

Insertion in crawl-ref/source/tags.cc at line 312 [16.164589]

Deletion in crawl-ref/source/tags.cc at line 1287 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 1297 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 1299 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 1313 [16.164589]

Replacement in crawl-ref/source/tags.cc at line 1324 [16.164589]

Insertion in crawl-ref/source/tags.cc at line 1335 [16.164589]

Insertion in crawl-ref/source/tags.cc at line 1558 [16.164589]

Insertion in crawl-ref/source/stuff.cc at line 1082 [16.224557]

Insertion in crawl-ref/source/stuff.cc at line 1107 [16.224557]

Replacement in crawl-ref/source/notes.cc at line 116 [10.370339]

Insertion in crawl-ref/source/notes.cc at line 179 [10.370339]

Replacement in crawl-ref/source/notes.cc at line 193 [10.370339]

Replacement in crawl-ref/source/notes.cc at line 343 [10.370339]

Replacement in crawl-ref/source/message.cc at line 88 [16.1993826]

Replacement in crawl-ref/source/maps.cc at line 78 [16.2007666]

Replacement in crawl-ref/source/maps.cc at line 82 [16.2007666]

Replacement in crawl-ref/source/maps.cc at line 123 [16.2007666]

Replacement in crawl-ref/source/mapdef.h at line 81 [10.591249]

Replacement in crawl-ref/source/mapdef.h at line 87 [10.591249]

Replacement in crawl-ref/source/mapdef.h at line 105 [10.591249]

Replacement in crawl-ref/source/mapdef.h at line 129 [10.591249]

Insertion in crawl-ref/source/mapdef.h at line 139 [10.591249]

Insertion in crawl-ref/source/mapdef.h at line 168 [10.591249]

Insertion in crawl-ref/source/mapdef.h at line 170 [10.591249]

Replacement in crawl-ref/source/mapdef.h at line 183 [10.591249]

Insertion in crawl-ref/source/mapdef.h at line 195 [10.591249]

Replacement in crawl-ref/source/mapdef.h at line 207 [10.591249]

Insertion in crawl-ref/source/mapdef.h at line 236 [10.591249]

Replacement in crawl-ref/source/mapdef.h at line 501 [10.591249]

Replacement in crawl-ref/source/mapdef.cc at line 340 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 365 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 371 [10.594797]

Insertion in crawl-ref/source/mapdef.cc at line 383 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 388 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 429 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 692 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 768 [10.594797]

Insertion in crawl-ref/source/mapdef.cc at line 770 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 772 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 779 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 821 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 826 [10.594797]

Insertion in crawl-ref/source/mapdef.cc at line 863 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 879 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 896 [10.594797]

Insertion in crawl-ref/source/mapdef.cc at line 918 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1055 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1060 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1231 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1473 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1475 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 2091 [10.594797]

Insertion in crawl-ref/source/mapdef.cc at line 2094 [10.594797]

Replacement in crawl-ref/source/mapdef.cc at line 2141 [10.594797]