fiddlerwoaroof/crawl - Change T4IH76FA5TWHFOZUJFHLQXQJENJHWTUZZP4EGNA7D4GTZY7D4ZKAC

Tweaked stash-tracker so that greedy explore works in Pandemonium.

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

Created by dshaligram on December 12, 2006

T4IH76FA5TWHFOZUJFHLQXQJENJHWTUZZP4EGNA7D4GTZY7D4ZKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.h at line 112 [5.29464]
B:BD[5.33964] → [6.85723:85810]
```
// Identifies a level. This has no meaning in the Abyss, labyrinths or
// Pandemonium.
```
[5.33964]
[5.33964]
```
// Identifies a level.
```

Replacement in crawl-ref/source/travel.h at line 115 [5.29464]

B:BD[5.33982] → [5.33982:34213]

    unsigned char branch;   // The branch in which the level is.
    int           depth;    // What depth (in this branch - starting from 1)
                            // this level is.
    level_id() : branch(0), depth(-1) { }

[5.33982]

[5.34213]

public:
    int branch;     // The branch in which the level is.
    int depth;      // What depth (in this branch - starting from 1)
    int level_type;

Replacement in crawl-ref/source/travel.h at line 120 [5.29464]

B:BD[5.34214] → [5.34214:34283]

    level_id(unsigned char br, int dep) : branch(br), depth(dep) { }

[5.34214]

[7.564]

public:
    level_id() : branch(0), depth(-1), level_type(LEVEL_DUNGEON) { }
    level_id(int br, int dep, int ltype = LEVEL_DUNGEON)
        : branch(br), depth(dep), level_type(ltype)
    {
        if (level_type != LEVEL_DUNGEON)
            branch = depth = -1;
    }
    level_id(int ltype) : branch(-1), depth(-1), level_type(ltype) { }

Insertion in crawl-ref/source/travel.h at line 131 [5.29464]

[7.606]

    std::string describe(bool long_name = false, bool with_number = true) const;

Replacement in crawl-ref/source/travel.h at line 133 [5.29464]

B:BD[7.607] → [7.607:675]

    std::string describe( bool long_name, bool with_number ) const;

[7.607]

[5.34283]

    bool is_valid() const
    {
        return (branch != -1 && depth != -1) || level_type != LEVEL_DUNGEON;
    }

Replacement in crawl-ref/source/travel.h at line 139 [5.29464]
B:BD[5.34334] → [5.34334:34378]
```
    static level_id get_current_level_id();
```
[5.34334]
[5.34378]
```
    static level_id current();
```

Replacement in crawl-ref/source/travel.h at line 147 [5.29464]

B:BD[5.34616] → [5.34616:34673]

        return branch == id.branch && depth == id.depth;

[5.34616]

[5.34673]

        return branch == id.branch && depth == id.depth
            && level_type == id.level_type;

Replacement in crawl-ref/source/travel.h at line 153 [5.29464]

B:BD[5.34736] → [5.34736:34793]

        return branch != id.branch || depth != id.depth;

[5.34736]

[7.676]

        return branch != id.branch || depth != id.depth
            || level_type != id.level_type;

Insertion in crawl-ref/source/travel.h at line 159 [5.29464]

[7.737]

        if (level_type != id.level_type)
            return (level_type < id.level_type);

Deletion in crawl-ref/source/travel.h at line 164 [5.29464]

B:BD[5.34799] → [5.34799:35063]


    struct less_than
    {
        bool operator () (const level_id &first, const level_id &second) const
        {
            return first.branch < second.branch ||
                (first.branch == second.branch && first.depth < second.depth);
        }
    };

Insertion in crawl-ref/source/travel.h at line 366 [5.29464]

[5.38988]

    }
    LevelInfo *find_level_info(const level_id &lev)
    {
        std::map<level_id, LevelInfo>::iterator i = levels.find(lev);
        return (i != levels.end()? &i->second : NULL);

Replacement in crawl-ref/source/travel.h at line 406 [5.29464]
B:BD[5.39661] → [5.39661:39724]
```
    std::map<level_id, LevelInfo, level_id::less_than> levels;
```
[5.39661]
[5.39724]
```
    std::map<level_id, LevelInfo> levels;
```
Replacement in crawl-ref/source/travel.cc at line 39 [5.39949]
B:BD[5.40495] → [5.40495:40540]
```
#define TC_MINOR_VERSION ((unsigned char) 4)
```
[5.40495]
[5.40540]
```
#define TC_MINOR_VERSION ((unsigned char) 5)
```

Replacement in crawl-ref/source/travel.cc at line 311 [5.39949]

B:BD[5.47337] → [5.47337:47453]

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

[5.47337]

[5.47453]

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

Replacement in crawl-ref/source/travel.cc at line 345 [5.39949]

B:BD[5.48205] → [5.48205:48321]

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

[5.48205]

[5.48321]

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

Replacement in crawl-ref/source/travel.cc at line 649 [5.39949]

B:BD[5.59776] → [6.87283:87343]

    const level_id curr = level_id::get_current_level_id();

[5.59776]

[6.87343]

    const level_id curr = level_id::current();

Replacement in crawl-ref/source/travel.cc at line 957 [5.39949]

B:BD[5.66414] → [5.66414:66489]

                                        level_id::get_current_level_id()))

[5.66414]

[5.66489]

                                        level_id::current()))

Replacement in crawl-ref/source/travel.cc at line 960 [5.39949]

B:BD[5.66555] → [5.66555:66631]

                        && last_stair == level_id::get_current_level_id())

[5.66555]

[5.66631]

                        && last_stair == level_id::current())

Replacement in crawl-ref/source/travel.cc at line 978 [5.39949]

B:BD[5.67490] → [5.67490:67557]

                    last_stair = level_id::get_current_level_id();

[5.67490]

[5.67557]

                    last_stair = level_id::current();

Replacement in crawl-ref/source/travel.cc at line 1402 [5.39949]
B:BD[5.78587] → [5.78587:78638]
```
unsigned char find_parent_branch(unsigned char br)
```
[5.78587]
[5.78638]
```
int find_parent_branch(int br)
```

Replacement in crawl-ref/source/travel.cc at line 1409 [5.39949]

B:BD[3.2417] → [3.2417:2474]

            return (unsigned char) branch_backout[i][1];

[3.2417]

[5.78853]

            return branch_backout[i][1];

Replacement in crawl-ref/source/travel.cc at line 1416 [5.39949]

B:BD[5.78929] → [5.78929:79035]

void find_parent_branch(unsigned char br, int depth, 
                        unsigned char *pb, int *pd)

[5.78929]

[5.79035]

void find_parent_branch(int br, int depth, 
                        int *pb, int *pd)

Replacement in crawl-ref/source/travel.cc at line 1445 [5.39949]

B:BD[5.79895] → [5.79895:79946]

               unsigned char branch, int subdepth)

[5.79895]

[5.79946]

               int branch, int subdepth)

Replacement in crawl-ref/source/travel.cc at line 1454 [5.39949]
B:BD[5.80112] → [5.80112:80138]
```
        unsigned char pb;
```
[5.80112]
[5.80138]
```
        int pb;
```
Replacement in crawl-ref/source/travel.cc at line 1647 [5.39949]
B:BD[5.86215] → [5.86215:86267]
```
    level_id id = level_id::get_current_level_id();
```
[5.86215]
[5.86267]
```
    level_id id = level_id::current();
```
Replacement in crawl-ref/source/travel.cc at line 1849 [5.39949]
B:BD[5.92489] → [5.92489:92543]
```
    level_id curr = level_id::get_current_level_id();
```
[5.92489]
[5.92543]
```
    level_id curr = level_id::current();
```
Replacement in crawl-ref/source/travel.cc at line 1883 [5.39949]
B:BD[5.93335] → [5.93335:93389]
```
    level_id curr = level_id::get_current_level_id();
```
[5.93335]
[5.93389]
```
    level_id curr = level_id::current();
```
Replacement in crawl-ref/source/travel.cc at line 1943 [5.39949]
B:BD[5.94825] → [5.94825:94877]
```
    if (pos.id != level_id::get_current_level_id())
```
[5.94825]
[5.94877]
```
    if (pos.id != level_id::current())
```

Replacement in crawl-ref/source/travel.cc at line 1963 [5.39949]

B:BD[5.95454] → [5.95454:95530]

    travel_cache.get_level_info(level_id::get_current_level_id()).update();

[5.95454]

[5.95530]

    travel_cache.get_level_info(level_id::current()).update();

Replacement in crawl-ref/source/travel.cc at line 1977 [5.39949]

B:BD[5.95964] → [5.95964:96028]

    if (level_id::get_current_level_id() == travel_target.id &&

[5.95964]

[5.96028]

    if (level_id::current() == travel_target.id &&

Replacement in crawl-ref/source/travel.cc at line 2042 [5.39949]

B:BD[5.98973] → [5.98973:99035]

    level_id player_level = level_id::get_current_level_id();

[5.98973]

[2.806]

    level_id player_level = level_id::current();

Replacement in crawl-ref/source/travel.cc at line 2262 [5.39949]
B:BD[5.106830] → [5.106830:106887]
```
    level_id current = level_id::get_current_level_id();
```
[5.106830]
[5.106887]
```
    level_id current = level_id::current();
```

Replacement in crawl-ref/source/travel.cc at line 2323 [5.39949]

B:BD[5.108564] → [5.108564:108625]

        travel_target.id = level_id::get_current_level_id();

[5.108564]

[5.108625]

        travel_target.id = level_id::current();

Replacement in crawl-ref/source/travel.cc at line 2404 [5.39949]
B:BD[5.110547] → [5.110547:110589]
```
level_id level_id::get_current_level_id()
```
[5.110547]
[5.110589]
```
level_id level_id::current()
```

Replacement in crawl-ref/source/travel.cc at line 2406 [5.39949]

B:BD[5.110591] → [5.110591:110713]

    level_id id;
    id.branch = you.where_are_you;
    id.depth  = subdungeon_depth(you.where_are_you, you.your_level);

[5.110591]

[5.110713]

    const level_id id(you.where_are_you,
                      subdungeon_depth(you.where_are_you, you.your_level),
                      you.level_type);

Replacement in crawl-ref/source/travel.cc at line 2415 [5.39949]
B:BD[5.110829] → [5.110829:110871]
```
    level_id id = get_current_level_id();
```
[5.110829]
[5.110871]
```
    level_id id = current();
```

Replacement in crawl-ref/source/travel.cc at line 2519 [5.39949]

B:BD[7.1346] → [7.1346:1405]

    return get_packed_place(branch, depth, LEVEL_DUNGEON);

[7.1346]

[5.113827]

    return get_packed_place(branch, depth, level_type);

Replacement in crawl-ref/source/travel.cc at line 2529 [5.39949]
B:BD[5.113870] → [5.113870:113899]
```
    writeByte(file, branch);
```
[5.113870]
[5.113899]
```
    writeShort(file, branch);
```
Insertion in crawl-ref/source/travel.cc at line 2531 [5.39949]
[5.113928]
[5.113928]
```
    writeShort(file, level_type);
```

Replacement in crawl-ref/source/travel.cc at line 2536 [5.39949]

B:BD[5.113965] → [5.113965:114024]

    branch = readByte(file);
    depth  = readShort(file);

[5.113965]

[5.114024]

    branch     = readShort(file);
    depth      = readShort(file);
    level_type = readShort(file);

Replacement in crawl-ref/source/travel.cc at line 3001 [5.39949]
B:BD[5.126409] → [5.126409:126455]
```
    lp.id = level_id::get_current_level_id();
```
[5.126409]
[5.126455]
```
    lp.id = level_id::current();
```
Replacement in crawl-ref/source/travel.cc at line 3064 [5.39949]
∅:D[3.2677] → [5.127971:128031]
B:BD[5.127971] → [5.127971:128031]
```
    const level_id &lid = level_id::get_current_level_id();
```
[3.2677]
[5.128031]
```
    const level_id &lid = level_id::current();
```

Replacement in crawl-ref/source/travel.cc at line 3086 [5.39949]

B:BD[5.128428] → [5.128428:128533]

    std::map<level_id, LevelInfo, level_id::less_than>::iterator i =
                    levels.begin();

[5.128428]

[5.128533]

    std::map<level_id, LevelInfo>::iterator i = levels.begin();

Replacement in crawl-ref/source/travel.cc at line 3093 [5.39949]

B:BD[5.128673] → [5.128673:128748]

    std::map<level_id, LevelInfo, level_id::less_than>::const_iterator i =

[5.128673]

[5.128748]

    std::map<level_id, LevelInfo>::const_iterator i =

Replacement in crawl-ref/source/travel.cc at line 3111 [5.39949]

B:BD[5.129183] → [5.129183:129258]

    std::map<level_id, LevelInfo, level_id::less_than>::const_iterator i =

[5.129183]

[5.129258]

    std::map<level_id, LevelInfo>::const_iterator i =

Insertion in crawl-ref/source/travel.cc at line 3115 [5.39949]

[5.129332]

        if (i->first.level_type != LEVEL_DUNGEON)
            continue;

Replacement in crawl-ref/source/travel.cc at line 3157 [5.39949]

B:BD[5.130305] → [5.130305:130384]

        get_level_info(level_id::get_current_level_id()).set_level_excludes();

[5.130305]

[5.130384]

        get_level_info(level_id::current()).set_level_excludes();

Replacement in crawl-ref/source/travel.cc at line 3163 [5.39949]

B:BD[5.130449] → [5.130449:130516]

        get_level_info(level_id::get_current_level_id()).update();

[5.130449]

[5.130552]

        get_level_info(level_id::current()).update();

Replacement in crawl-ref/source/travel.cc at line 3168 [5.39949]

B:BD[5.130590] → [5.130590:130691]

    std::map<level_id, LevelInfo, level_id::less_than>::iterator i =
                levels.begin();

[5.130590]

[5.130691]

    std::map<level_id, LevelInfo>::iterator i = levels.begin();

Insertion in crawl-ref/source/stash.h at line 18 [5.138156]
[5.138462]
[5.138462]
```
#include "misc.h"
```
Insertion in crawl-ref/source/stash.h at line 22 [5.138156]
[5.138504]
[5.138504]
```
void stash_init_new_level();
```
Insertion in crawl-ref/source/stash.h at line 210 [5.138156]
[5.143519]
[5.143519]
```
    level_id where() const;
    
```

Replacement in crawl-ref/source/stash.h at line 246 [5.138156]

B:BD[5.144588] → [5.144588:144704]

    bool  isCurrent() const;
    bool  isBelowPlayer() const;
    bool  operator < (const LevelStashes &lev) const;

[5.144588]

[5.144704]

    bool  is_current() const;

Replacement in crawl-ref/source/stash.h at line 249 [5.138156]
B:BD[5.144732] → [5.144732:144773]
```
    unsigned char branch;
    int depth;
```
[5.144732]
[5.144773]
```
    level_id place;
```

Replacement in crawl-ref/source/stash.h at line 251 [5.138156]

B:BD[5.144774] → [5.144774:144862]

    typedef std::map<int, Stash>  c_stashes;
    typedef std::vector<ShopInfo> c_shops;

[5.144774]

[5.144862]

    typedef std::map<int, Stash>  stashes_t;
    typedef std::vector<ShopInfo> shops_t;

Replacement in crawl-ref/source/stash.h at line 254 [5.138156]
B:BD[5.144867] → [5.144867:144911]
```
    c_stashes stashes;
    c_shops   shops;
```
[5.144867]
[5.144911]
```
    stashes_t stashes;
    shops_t   shops;
```

Replacement in crawl-ref/source/stash.h at line 268 [5.138156]

B:BD[4.5203] → [4.5203:5300]

            || you.level_type == LEVEL_ABYSS
            || you.level_type == LEVEL_PANDEMONIUM;

[4.5203]

[5.145195]

            || you.level_type == LEVEL_ABYSS;

Insertion in crawl-ref/source/stash.h at line 279 [5.138156]
[5.145352]
[5.145352]
```
    LevelStashes *find_level(const level_id &pos);
```

Replacement in crawl-ref/source/stash.h at line 286 [5.138156]

B:BD[5.145455] → [5.145455:145502]

    void remove_level(const LevelStashes &ls);

[5.145455]

[5.145502]

    void remove_level(const level_id &which = level_id::current());

Deletion in crawl-ref/source/stash.h at line 317 [5.138156]
B:BD[5.146634] → [5.146634:146681]
```
private:
    std::vector<LevelStashes> levels;
```
Insertion in crawl-ref/source/stash.h at line 318 [5.138156]
[5.146682]
[5.146682]
```
private:
```

Insertion in crawl-ref/source/stash.h at line 322 [5.138156]

[5.146897]


private:
    typedef std::map<level_id, LevelStashes> stash_levels_t;
    stash_levels_t levels;

Replacement in crawl-ref/source/stash.cc at line 36 [5.147324]
B:BD[5.147922] → [5.147922:147963]
```
#define ST_MINOR_VER ((unsigned char) 4)
```
[5.147922]
[5.147963]
```
#define ST_MINOR_VER ((unsigned char) 5)
```

Insertion in crawl-ref/source/stash.cc at line 42 [5.147324]

[5.148141]

[5.148284]

void stash_init_new_level()
{
    // If there's an existing stash level for Pan, blow it away.
    stashes.remove_level( level_id(LEVEL_PANDEMONIUM) );
}

Replacement in crawl-ref/source/stash.cc at line 859 [5.147324]
B:BD[5.169144] → [5.169144:169173]
```
LevelStashes::LevelStashes()
```
[5.169144]
[5.169173]
```
LevelStashes::LevelStashes() : place(), stashes(), shops()
```
Deletion in crawl-ref/source/stash.cc at line 861 [5.147324]
B:BD[5.169175] → [5.169175:169236]
```
    branch = you.where_are_you;
    depth  = you.your_level;
```
Replacement in crawl-ref/source/stash.cc at line 863 [5.147324]
B:BD[5.169239] → [5.169239:169301]
```
bool LevelStashes::operator < (const LevelStashes &lev) const
```
[5.169239]
[5.169301]
```
level_id LevelStashes::where() const
```
Replacement in crawl-ref/source/stash.cc at line 865 [5.147324]
B:BD[5.169303] → [5.169303:169382]
```
    return branch < lev.branch || (branch == lev.branch && depth < lev.depth);
```
[5.169303]
[5.169382]
```
    return (place);
```

Deletion in crawl-ref/source/stash.cc at line 868 [5.147324]

B:BD[5.169385] → [5.169385:169538]

bool LevelStashes::isBelowPlayer() const
{
    return branch > you.where_are_you 
        || (branch == you.where_are_you && depth > you.your_level);
}

Replacement in crawl-ref/source/stash.cc at line 882 [5.147324]

B:BD[5.169710] → [8.6252:6309]

    c_stashes::const_iterator st = stashes.find(abspos);

[5.169710]

[5.169761]

    stashes_t::const_iterator st = stashes.find(abspos);

Replacement in crawl-ref/source/stash.cc at line 985 [5.147324]
B:BD[5.171548] → [5.171548:171585]
```
bool LevelStashes::isCurrent() const
```
[5.171548]
[5.171585]
```
bool LevelStashes::is_current() const
```
Replacement in crawl-ref/source/stash.cc at line 987 [5.147324]
B:BD[5.171587] → [5.171587:171654]
```
    return branch == you.where_are_you && depth == you.your_level;
```
[5.171587]
[5.171654]
```
    return (place == level_id::current());
```

Replacement in crawl-ref/source/stash.cc at line 992 [5.147324]

B:BD[5.171694] → [5.171694:171818]

    return branch >= BRANCH_DIS 
            && branch <= BRANCH_THE_PIT
            && branch != BRANCH_VESTIBULE_OF_HELL;

[5.171694]

[5.171818]

    return place.branch >= BRANCH_DIS
            && place.branch <= BRANCH_THE_PIT
            && place.branch != BRANCH_VESTIBULE_OF_HELL;

Replacement in crawl-ref/source/stash.cc at line 999 [5.147324]
B:BD[5.171872] → [5.171872:171903]
```
    return branch == branchid;
```
[5.171872]
[5.171903]
```
    return place.branch == branchid;
```

Replacement in crawl-ref/source/stash.cc at line 1005 [5.147324]

B:BD[5.171954] → [5.171954:172021]

B:BD[5.172021] → [6.117639:117774]

    int curr_subdungeon_level = subdungeon_depth( branch, depth );
    return (place_name(
                get_packed_place(branch, curr_subdungeon_level, LEVEL_DUNGEON), 
                true, true));

[5.171954]

[5.172084]

    return place.describe(true, true);

Replacement in crawl-ref/source/stash.cc at line 1010 [5.147324]

B:BD[5.172140] → [5.172140:172296]

    return (short_place_name(
            get_packed_place( branch, 
                subdungeon_depth( branch, depth ),
                LEVEL_DUNGEON ) ));

[5.172140]

[5.172296]

    return place.describe();

Replacement in crawl-ref/source/stash.cc at line 1019 [5.147324]

B:BD[5.172416] → [5.172416:172476]

    for (c_stashes::const_iterator iter = stashes.begin();

[5.172416]

[5.172476]

    for (stashes_t::const_iterator iter = stashes.begin();

Replacement in crawl-ref/source/stash.cc at line 1033 [5.147324]

B:BD[5.172754] → [5.172754:172934]

    level_id clid(branch, subdungeon_depth(branch, depth));
    std::string lplace = "{" + short_place_name(clid) + "}";
    for (c_stashes::const_iterator iter = stashes.begin();

[5.172754]

[5.172934]

    std::string lplace = "{" + place.describe() + "}";
    for (stashes_t::const_iterator iter = stashes.begin();

Replacement in crawl-ref/source/stash.cc at line 1042 [5.147324]
B:BD[5.173144] → [9.425:460]
```
                res.pos.id = clid;
```
[5.173144]
[5.173178]
```
                res.pos.id = place;
```
Replacement in crawl-ref/source/stash.cc at line 1053 [5.147324]
B:BD[5.173404] → [9.461:492]
```
            res.pos.id = clid;
```
[5.173404]
[5.173434]
```
            res.pos.id = place;
```
Replacement in crawl-ref/source/stash.cc at line 1074 [5.147324]
∅:D[6.117825] → [5.173916:173980]
B:BD[5.173916] → [5.173916:173980]
```
        for (c_stashes::const_iterator iter = stashes.begin(); 
```
[6.117825]
[5.173980]
```
        for (stashes_t::const_iterator iter = stashes.begin(); 
```
Replacement in crawl-ref/source/stash.cc at line 1088 [5.147324]
B:BD[5.174277] → [5.174277:174343]
```
    writeByte(file, branch);
    writeShort(file, (short) depth);
```
[5.174277]
[5.174343]
```
    place.save(file);
```

Replacement in crawl-ref/source/stash.cc at line 1091 [5.147324]

B:BD[5.174384] → [5.174384:174444]

    for (c_stashes::const_iterator iter = stashes.begin();

[5.174384]

[5.174444]

    for (stashes_t::const_iterator iter = stashes.begin();

Replacement in crawl-ref/source/stash.cc at line 1104 [5.147324]
B:BD[5.174716] → [5.174716:174775]
```
    branch = readByte(file);
    depth  = readShort(file);
```
[5.174716]
[5.174775]
```
    place.load(file);
```

Replacement in crawl-ref/source/stash.cc at line 1133 [5.147324]

B:BD[5.175287] → [5.175287:175633]

    std::vector<LevelStashes>::iterator iter = levels.begin();
    for ( ; iter != levels.end() && !iter->isBelowPlayer(); iter++)
    {
        if (iter->isCurrent()) return *iter;
    }
    if (iter == levels.end())
        levels.push_back(LevelStashes());
    else
        levels.insert(iter, LevelStashes());
    return get_current_level();

[5.175287]

[5.175633]

    return (levels[level_id::current()]);
}
LevelStashes *StashTracker::find_level(const level_id &id)
{
    stash_levels_t::iterator i = levels.find(id);
    return (i != levels.end()? &i->second : NULL);

Replacement in crawl-ref/source/stash.cc at line 1146 [5.147324]

B:BD[4.5357] → [4.5357:5362]

∅:D[4.5362] → [5.175687:175876]

B:BD[5.175687] → [5.175687:175876]

B:BD[5.175876] → [4.5363:5382]

    
    std::vector<LevelStashes>::iterator iter = levels.begin();
    for ( ; iter != levels.end() && !iter->isBelowPlayer(); iter++)
    {
        if (iter->isCurrent()) return &*iter;
    }
    return (NULL);

[4.5357]

[5.175893]


    return find_level(level_id::current());

Replacement in crawl-ref/source/stash.cc at line 1158 [5.147324]
B:BD[5.176087] → [5.176087:176119]
```
            remove_level(*lev);
```
[5.176087]
[5.176119]
```
            remove_level();
```
Replacement in crawl-ref/source/stash.cc at line 1164 [5.147324]
B:BD[5.176166] → [5.176166:176222]
```
void StashTracker::remove_level(const LevelStashes &ls)
```
[5.176166]
[5.176222]
```
void StashTracker::remove_level(const level_id &place)
```

Replacement in crawl-ref/source/stash.cc at line 1166 [5.147324]

B:BD[5.176224] → [5.176224:176440]

    std::vector<LevelStashes>::iterator iter = levels.begin();
    for ( ; iter != levels.end(); ++iter)
    {
        if (&ls == &*iter)
        {
            levels.erase(iter);
            break ;
        }
    }

[5.176224]

[5.176440]

    levels.erase(place);

Replacement in crawl-ref/source/stash.cc at line 1176 [5.147324]
B:BD[5.176645] → [5.176645:176676]
```
        remove_level(current);
```
[5.176645]
[5.176676]
```
        remove_level();
```
Replacement in crawl-ref/source/stash.cc at line 1194 [5.147324]
B:BD[5.177039] → [5.177039:177070]
```
        remove_level(current);
```
[5.177039]
[5.177070]
```
        remove_level();
```

Replacement in crawl-ref/source/stash.cc at line 1214 [5.147324]

B:BD[5.177467] → [5.177467:177586]

        std::vector<LevelStashes>::const_iterator iter = levels.begin();
        for ( ; iter != levels.end(); iter++)

[5.177467]

[5.177586]

        for (stash_levels_t::const_iterator iter = levels.begin();
             iter != levels.end(); iter++)

Replacement in crawl-ref/source/stash.cc at line 1217 [5.147324]
B:BD[5.177596] → [5.177596:177635]
```
            iter->write(os, identify);
```
[5.177596]
[5.177635]
```
            iter->second.write(os, identify);
```

Replacement in crawl-ref/source/stash.cc at line 1232 [5.147324]

B:BD[5.177948] → [5.177948:178017]

    std::vector<LevelStashes>::const_iterator iter = levels.begin();

[5.177948]

[5.178017]

    stash_levels_t::const_iterator iter = levels.begin();

Replacement in crawl-ref/source/stash.cc at line 1234 [5.147324]
B:BD[5.178059] → [5.178059:178085]
```
        iter->save(file);
```
[5.178059]
[5.178085]
```
        iter->second.save(file);
```

Replacement in crawl-ref/source/stash.cc at line 1252 [5.147324]

B:BD[5.178518] → [5.178518:178570]

        if (st.stash_count()) levels.push_back(st);

[5.178518]

[5.178570]

        if (st.stash_count())
            levels[st.where()] = st;

Replacement in crawl-ref/source/stash.cc at line 1290 [5.147324]
B:BD[5.179556] → [5.179556:179584]
```
        remove_level(*lev);
```
[5.179556]
[5.179584]
```
        remove_level();
```

Replacement in crawl-ref/source/stash.cc at line 1365 [5.147324]

B:BD[5.181350] → [5.181350:181419]

    std::vector<LevelStashes>::const_iterator iter = levels.begin();

[5.181350]

[5.181419]

    stash_levels_t::const_iterator iter = levels.begin();

Replacement in crawl-ref/source/stash.cc at line 1368 [5.147324]

B:BD[5.181467] → [5.181467:181520]

        iter->get_matching_stashes(search, results);

[5.181467]

[5.181520]

        iter->second.get_matching_stashes(search, results);

Replacement in crawl-ref/source/stash.cc at line 1375 [5.147324]
∅:D[9.683] → [5.181599:181653]
B:BD[5.181599] → [5.181599:181653]
```
    level_id curr = level_id::get_current_level_id();
```
[9.683]
[5.181653]
```
    level_id curr = level_id::current();
```
Replacement in crawl-ref/source/overmap.cc at line 388 [11.1070017]
B:BD[10.128] → [10.128:184]
```
    level_pos curpos(level_id::get_current_level_id());
```
[10.128]
[10.184]
```
    level_pos curpos(level_id::current());
```

Replacement in crawl-ref/source/overmap.cc at line 476 [11.1070017]

B:BD[11.1084896] → [7.14411:14477]

    stair_level[which_branch] = level_id::get_current_level_id();

[11.1084896]

[7.14477]

    stair_level[which_branch] = level_id::current();

Replacement in crawl-ref/source/overmap.cc at line 486 [11.1070017]
B:BD[11.1085625] → [7.14694:14754]
```
    level_pos where(level_id::get_current_level_id(), pos);
```
[7.14540]
[7.14754]
```
    level_pos where(level_id::current(), pos);
```
Replacement in crawl-ref/source/overmap.cc at line 493 [11.1070017]
∅:D[3.138499] → [9.4721:4788]
B:BD[9.4721] → [9.4721:4788]
```
    const level_pos curpos(level_id::get_current_level_id(), pos);
```
[3.138499]
[9.4788]
```
    const level_pos curpos(level_id::current(), pos);
```
Replacement in crawl-ref/source/overmap.cc at line 522 [11.1070017]
B:BD[11.1087407] → [7.15250:15310]
```
    level_pos where(level_id::get_current_level_id(), pos);
```
[11.1087407]
[11.1087546]
```
    level_pos where(level_id::current(), pos);
```
Insertion in crawl-ref/source/misc.h at line 89 [11.1928926]
[11.1931978]
[11.1931978]
```
void init_new_level();
```

Replacement in crawl-ref/source/misc.cc at line 561 [11.1933596]

B:BD[5.248887] → [5.248887:248953]

    level_id  old_level_id    = level_id::get_current_level_id();

[5.248887]

[5.248953]

    level_id  old_level_id    = level_id::current();

Replacement in crawl-ref/source/misc.cc at line 672 [11.1933596]
B:BD[5.249200] → [5.249200:249229]
```
    travel_init_new_level();
```
[5.249200]
[5.249229]
```
    init_new_level();
```

Replacement in crawl-ref/source/misc.cc at line 677 [11.1933596]

B:BD[5.249384] → [5.249384:249454]

        level_id  new_level_id    = level_id::get_current_level_id();

[5.249384]

[5.249454]

        level_id  new_level_id    = level_id::current();

Replacement in crawl-ref/source/misc.cc at line 824 [11.1933596]

B:BD[5.252110] → [5.252110:252176]

    level_id  old_level_id    = level_id::get_current_level_id();

[5.252110]

[5.252176]

    level_id  old_level_id    = level_id::current();

Replacement in crawl-ref/source/misc.cc at line 1112 [11.1933596]
B:BD[5.252464] → [5.252464:252493]
```
    travel_init_new_level();
```
[5.252464]
[5.252493]
```
    init_new_level();
```

Replacement in crawl-ref/source/misc.cc at line 1117 [11.1933596]

B:BD[5.252646] → [5.252646:252716]

        level_id  new_level_id    = level_id::get_current_level_id();

[5.252646]

[5.252716]

        level_id  new_level_id    = level_id::current();

Insertion in crawl-ref/source/misc.cc at line 1146 [11.1933596]

[11.1959387]

void init_new_level()
{
    travel_init_new_level();
    stash_init_new_level();
}

Replacement in crawl-ref/source/initfile.cc at line 207 [11.2957258]
B:BD[11.2961404] → [5.392252:392299]
```
static std::string weapon_to_str( int weapon )
```
[11.2961404]
[5.392299]
```
std::string weapon_to_str( int weapon )
```
Insertion in crawl-ref/source/initfile.cc at line 892 [11.2957258]
[5.397382]
[5.397382]
```
#ifndef DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 912 [11.2957258]
[6.797726]
[5.397921]
```
#endif // !DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 915 [11.2957258]
[5.397924]
[5.397924]
```
#ifndef DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 964 [11.2957258]
[5.399247]
[11.2967794]
```
#endif // !DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 968 [11.2957258]
[5.399284]
[5.399284]
```
#ifndef DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 975 [11.2957258]
[5.399438]
[5.399438]
```
#endif // !DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 980 [11.2957258]
[5.399467]
[5.399467]
```
#ifndef DISABLE_STICKY_STARTUP_OPTIONS
```
Insertion in crawl-ref/source/initfile.cc at line 989 [11.2957258]
[5.399791]
[5.399791]
```
#endif // !DISABLE_STICKY_STARTUP_OPTIONS
```
Replacement in crawl-ref/source/files.cc at line 241 [11.3084589]
B:BD[6.858159] → [6.858159:858214]
```
static bool is_save_file_name(const std::string &name)
```
[6.858159]
[6.858214]
```
bool is_save_file_name(const std::string &name)
```
Replacement in crawl-ref/source/files.cc at line 247 [11.3084589]
B:BD[6.858281] → [6.858281:858333]
```
static bool is_packed_save(const std::string &name)
```
[6.858281]
[5.433068]
```
bool is_packed_save(const std::string &name)
```
Replacement in crawl-ref/source/files.cc at line 254 [11.3084589]
B:BD[6.858441] → [6.858441:858504]
```
static player read_character_info(const std::string &savefile)
```
[6.858441]
[11.3089943]
```
player read_character_info(const std::string &savefile)
```

Replacement in crawl-ref/source/files.cc at line 266 [11.3084589]

B:BD[6.858698] → [6.858698:858798]

    if (!determine_version(charf, majorVersion, minorVersion))
        goto done_reading_character;

[6.858698]

[6.858798]

    if (determine_version(charf, majorVersion, minorVersion)
        && majorVersion == SAVE_MAJOR_VERSION)
    {
        restore_tagged_file(charf, TAGTYPE_PLAYER_NAME, minorVersion);
        fromfile = you;
        you      = backup;
    }

Deletion in crawl-ref/source/files.cc at line 274 [11.3084589]

B:BD[6.858799] → [6.858799:858991]

∅:D[6.858991] → [11.3089968:3089969]

B:BD[11.3089968] → [11.3089968:3089969]

B:BD[11.3089969] → [6.858992:859016]

    if (majorVersion != SAVE_MAJOR_VERSION)
        goto done_reading_character;
    restore_tagged_file(charf, TAGTYPE_PLAYER_NAME, minorVersion);
    fromfile = you;
    you      = backup;
done_reading_character:

Replacement in crawl-ref/source/files.cc at line 280 [11.3084589]

B:BD[6.859184] → [6.859184:859258]

static std::vector<std::string> get_dir_files(const std::string &dirname)

[6.859184]

[6.859258]

std::vector<std::string> get_dir_files(const std::string &dirname)

Insertion in crawl-ref/source/files.cc at line 446 [11.3084589]
[6.862958]
[6.862958]
```
    std::vector<player> chars;
#ifndef DISABLE_SAVEGAME_LISTS
```
Deletion in crawl-ref/source/files.cc at line 454 [11.3084589]
B:BD[6.863128] → [6.863128:863159]
```
    std::vector<player> chars;
```
Insertion in crawl-ref/source/files.cc at line 496 [11.3084589]
[6.864300]
[6.864300]
```
#endif // !DISABLE_SAVEGAME_LISTS
```
Deletion in crawl-ref/source/debug.cc at line 2154 [11.4016436]
B:BD[6.1039186] → [6.1039186:1039273]
```
    // Also tell travel that its world-view must change.
    travel_init_new_level();
```
Replacement in crawl-ref/source/acr.cc at line 2772 [11.4397395]
B:BD[11.4470970] → [5.552507:552536]
```
    travel_init_new_level();
```
[11.4470970]
[5.552536]
```
    init_new_level();
```

Insertion in crawl-ref/source/AppHdr.h at line 59 [11.4573713]

[11.4576004]

[6.1300663]

// Uncomment to prevent Crawl from looking for a list of saves when
// asking the player to enter a name. This can speed up startup
// considerably if you have a lot of saves lying around (even more so
// if the saves are zipped).
// 
// #define DISABLE_SAVEGAME_LISTS
// Uncomment to prevent Crawl from remembering startup preferences.
// 
// #define DISABLE_STICKY_STARTUP_OPTIONS

Tweaked stash-tracker so that greedy explore works in Pandemonium.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.h at line 112 [5.29464]

Replacement in crawl-ref/source/travel.h at line 115 [5.29464]

Replacement in crawl-ref/source/travel.h at line 120 [5.29464]

Insertion in crawl-ref/source/travel.h at line 131 [5.29464]

Replacement in crawl-ref/source/travel.h at line 133 [5.29464]

Replacement in crawl-ref/source/travel.h at line 139 [5.29464]

Replacement in crawl-ref/source/travel.h at line 147 [5.29464]

Replacement in crawl-ref/source/travel.h at line 153 [5.29464]

Insertion in crawl-ref/source/travel.h at line 159 [5.29464]

Deletion in crawl-ref/source/travel.h at line 164 [5.29464]

Insertion in crawl-ref/source/travel.h at line 366 [5.29464]

Replacement in crawl-ref/source/travel.h at line 406 [5.29464]

Replacement in crawl-ref/source/travel.cc at line 39 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 311 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 345 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 649 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 957 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 960 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 978 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1402 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1409 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1416 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1445 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1454 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1647 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1849 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1883 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1943 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1963 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 1977 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2042 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2262 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2323 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2404 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2406 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2415 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2519 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2529 [5.39949]

Insertion in crawl-ref/source/travel.cc at line 2531 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2536 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3001 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3064 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3086 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3093 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3111 [5.39949]

Insertion in crawl-ref/source/travel.cc at line 3115 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3157 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3163 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 3168 [5.39949]

Insertion in crawl-ref/source/stash.h at line 18 [5.138156]

Insertion in crawl-ref/source/stash.h at line 22 [5.138156]

Insertion in crawl-ref/source/stash.h at line 210 [5.138156]

Replacement in crawl-ref/source/stash.h at line 246 [5.138156]

Replacement in crawl-ref/source/stash.h at line 249 [5.138156]

Replacement in crawl-ref/source/stash.h at line 251 [5.138156]

Replacement in crawl-ref/source/stash.h at line 254 [5.138156]

Replacement in crawl-ref/source/stash.h at line 268 [5.138156]

Insertion in crawl-ref/source/stash.h at line 279 [5.138156]

Replacement in crawl-ref/source/stash.h at line 286 [5.138156]

Deletion in crawl-ref/source/stash.h at line 317 [5.138156]

Insertion in crawl-ref/source/stash.h at line 318 [5.138156]

Insertion in crawl-ref/source/stash.h at line 322 [5.138156]

Replacement in crawl-ref/source/stash.cc at line 36 [5.147324]

Insertion in crawl-ref/source/stash.cc at line 42 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 859 [5.147324]

Deletion in crawl-ref/source/stash.cc at line 861 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 863 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 865 [5.147324]

Deletion in crawl-ref/source/stash.cc at line 868 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 882 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 985 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 987 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 992 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 999 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 1005 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 1010 [5.147324]