fiddlerwoaroof/crawl - Change KSM4H3SBM6FIQTUEGHXXYATJXEOJ4EKUBAFCRMFKSHY7N2HWECRQC

Allow ziggurats placed in Pandemonium to return to the same Pan level when the player leaves the ziggurat. Breaks saves.

Cleaned up up_stairs() and down_stairs() to remove spurious depth changes when changing you.level_type - depth (you.your_level) now changes only for stairs with both ends in LEVEL_DUNGEON.

All levels are now saved on exit, including non LEVEL_DUNGEON levels. Re-entering non-dungeon levels from down_stairs will still delete the old level. Re-entering non-dungeon levels from up_stairs (i.e. returning to a non-dungeon level from some other place, like a ziggurat) will reload the old level.

Fixed bogus marker trashing when player attempts to use a Zot entrance with insufficient runes.

Delete .msg files when game ends.

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

Created by dshaligram on November 24, 2008

KSM4H3SBM6FIQTUEGHXXYATJXEOJ4EKUBAFCRMFKSHY7N2HWECRQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/travel.h at line 181 [7.29464]
B:BD[7.33963] → [7.33963:33964]
B:BD[7.33964] → [8.227:381]
∅:D[8.381] → [9.169:184]
B:BD[10.36] → [9.169:184]
∅:D[9.184] → [7.33980:33982]
B:BD[7.33980] → [7.33980:33982]
B:BD[7.33982] → [10.37:45]
B:BD[10.45] → [11.129:303]
∅:D[10.191] → [7.34213:34214]
∅:D[11.303] → [7.34213:34214]
B:BD[7.34213] → [7.34213:34214]
B:BD[7.34214] → [10.192:200]
B:BD[10.200] → [12.114:195]
```
// Identifies a level. Should never include virtual methods or
// dynamically allocated memory (see code to push level_id onto Lua
// stack in luadgn.cc)
class level_id
{
public:
    branch_type branch;     // The branch in which the level is.
    int depth;              // What depth (in this branch - starting from 1)
    level_area_type level_type;
public:
    // Returns the level_id of the current level.
    static level_id current();
```

Deletion in crawl-ref/source/travel.h at line 182 [7.29464]

B:BD[12.196] → [12.196:376]

    // Returns the level_id of the level that the stair/portal/whatever at
    // 'pos' on the current level leads to.
    static level_id get_next_level_id(const coord_def &pos);

Deletion in crawl-ref/source/travel.h at line 183 [7.29464]

B:BD[12.377] → [11.304:494]

∅:D[11.494] → [10.326:384]

B:BD[10.326] → [10.326:384]

B:BD[11.574] → [13.128:245]

∅:D[13.245] → [10.458:464]

∅:D[11.574] → [10.458:464]

B:BD[10.458] → [10.458:464]

B:BD[10.464] → [11.575:691]

B:BD[11.691] → [14.128:207]

∅:D[14.207] → [15.564:606]

∅:D[10.535] → [15.564:606]

∅:D[11.691] → [15.564:606]

B:BD[7.34283] → [15.564:606]

B:BD[15.606] → [10.536:617]

∅:D[10.617] → [15.606:607]

B:BD[15.606] → [15.606:607]

B:BD[15.607] → [14.208:225]

∅:D[14.225] → [16.32:38]

B:BD[16.32] → [16.32:38]

B:BD[16.38] → [11.692:730]

∅:D[11.730] → [16.58:121]

B:BD[16.58] → [16.58:121]

B:BD[16.121] → [17.227:254]

∅:D[17.254] → [18.208:209]

B:BD[16.121] → [18.208:209]

∅:D[16.126] → [10.618:650]

∅:D[18.209] → [10.618:650]

B:BD[15.607] → [10.618:650]

B:BD[10.650] → [11.731:830]

B:BD[11.830] → [8.382:570]

∅:D[8.570] → [10.727:733]

∅:D[11.830] → [10.727:733]

B:BD[10.727] → [10.727:733]

∅:D[10.765] → [7.34378:34379]

B:BD[7.34378] → [7.34378:34379]

B:BD[7.34560] → [7.34560:34616]

B:BD[7.34616] → [13.246:407]

∅:D[19.212] → [7.34673:34736]

∅:D[13.407] → [7.34673:34736]

∅:D[10.866] → [7.34673:34736]

B:BD[7.34673] → [7.34673:34736]

B:BD[7.34736] → [19.213:247]

∅:D[19.247] → [15.676:737]

∅:D[10.967] → [15.676:737]

B:BD[7.34793] → [15.676:737]

B:BD[15.737] → [10.968:1058]

B:BD[10.1058] → [13.408:478]

B:BD[13.478] → [18.210:211]

∅:D[18.211] → [15.737:817]

∅:D[10.1067] → [15.737:817]

B:BD[15.737] → [15.737:817]

B:BD[15.817] → [20.134:271]

∅:D[20.271] → [7.34793:34799]

∅:D[15.817] → [7.34793:34799]

B:BD[7.34793] → [7.34793:34799]

B:BD[7.34799] → [21.134:135]

B:BD[21.135] → [20.272:381]

B:BD[20.382] → [20.382:383]

∅:D[21.161] → [7.35063:35064]

B:BD[7.35063] → [7.35063:35064]

B:BD[7.35064] → [22.761:815]

∅:D[22.815] → [7.35116:35120]

B:BD[7.35116] → [7.35116:35120]

    level_id()
        : branch(BRANCH_MAIN_DUNGEON), depth(-1),
          level_type(LEVEL_DUNGEON)
    {
    }
    level_id(branch_type br, int dep, level_area_type ltype = LEVEL_DUNGEON)
        : branch(br), depth(dep), level_type(ltype)
    {
    }
    level_id(const level_id &ot)
        : branch(ot.branch), depth(ot.depth), level_type(ot.level_type)
    {
    }
    level_id(level_area_type ltype)
        : branch(BRANCH_MAIN_DUNGEON), depth(-1), level_type(ltype)
    {
    }
    static level_id parse_level_id(const std::string &s) throw (std::string);
    unsigned short packed_place() const;
    std::string describe(bool long_name = false, bool with_number = true) const;
    void clear()
    {
        branch = BRANCH_MAIN_DUNGEON;
        depth  = -1;
        level_type = LEVEL_DUNGEON;
    }
    int absdepth() const;
    bool is_valid() const
    {
        return (branch != NUM_BRANCHES && depth != -1)
            || level_type != LEVEL_DUNGEON;
    }
    const level_id &operator = (const level_id &id)
    {
        branch     = id.branch;
        depth      = id.depth;
        level_type = id.level_type;
        return (*this);
    }
    bool operator == ( const level_id &id ) const
    {
        return (level_type == id.level_type
                && (level_type != LEVEL_DUNGEON
                    || (branch == id.branch && depth == id.depth)));
    }
    bool operator != ( const level_id &id ) const
    {
        return !operator == (id);
    }
    bool operator <( const level_id &id ) const
    {
        if (level_type != id.level_type)
            return (level_type < id.level_type);
        if (level_type != LEVEL_DUNGEON)
            return (false);
        return (branch < id.branch) || (branch==id.branch && depth < id.depth);
    }
    bool operator == ( const branch_type _branch ) const
    {
        return (branch == _branch && level_type == LEVEL_DUNGEON);
    }
    bool operator != ( const branch_type _branch  ) const
    {
        return !operator == (_branch);
    }
    void save(writer&) const;
    void load(reader&);
};

Replacement in crawl-ref/source/tags.cc at line 99 [23.164589]
B:BD[23.168130] → [24.2232:2294]
```
FixedArray < bool, MAX_LEVELS, NUM_BRANCHES > tmp_file_pairs;
```
[23.168130]
[25.571]
```
level_id_set Generated_Levels;
```

Insertion in crawl-ref/source/tags.cc at line 294 [23.164589]

[15.1950]

}
template <typename data>
void marshallSet(writer &th, const std::set<data> &s,
                 void (*marshall)(writer &, const data &))
{
    marshallLong( th, s.size() );
    typename std::set<data>::const_iterator i = s.begin();
    for ( ; i != s.end(); ++i)
        marshall(th, *i);

Insertion in crawl-ref/source/tags.cc at line 366 [23.164589]

[15.2762]

}
template <typename data, typename set>
void unmarshallSet(reader &th, set &dset,
                   data (*data_unmarshall)(reader &))
{
    dset.clear();
    long len = unmarshallLong(th);
    for (long i = 0L; i < len; ++i)
        dset.insert(data_unmarshall(th));

Deletion in crawl-ref/source/tags.cc at line 1120 [23.164589]
B:BD[23.186142] → [23.186142:186156]
```
    int i,j;
```
Replacement in crawl-ref/source/tags.cc at line 1122 [23.164589]
B:BD[26.57] → [26.57:96]
```
    for (j = 0; j < NUM_MONSTERS; ++j)
```
[26.57]
[27.1984]
```
    for (int j = 0; j < NUM_MONSTERS; ++j)
```
Replacement in crawl-ref/source/tags.cc at line 1127 [23.164589]
B:BD[24.2331] → [24.2331:2370]
```
    for (j = 0; j < NUM_BRANCHES; ++j)
```
[24.2331]
[28.1893]
```
    for (int j = 0; j < NUM_BRANCHES; ++j)
```

Replacement in crawl-ref/source/tags.cc at line 1133 [23.164589]

B:BD[23.186534] → [23.186534:186606]

B:BD[23.186606] → [24.2421:2464]

∅:D[24.2464] → [15.3724:3779]

B:BD[23.186655] → [15.3724:3779]

    marshallShort(th, MAX_LEVELS);
    for (i = 0; i < MAX_LEVELS; ++i)
        for (j = 0; j < NUM_BRANCHES; ++j)
            marshallBoolean(th, tmp_file_pairs[i][j]);

[23.186510]

[15.3779]

    marshallSet(th, Generated_Levels, marshall_level_id);

Deletion in crawl-ref/source/tags.cc at line 1561 [23.164589]
B:BD[23.202831] → [29.2892:2926]
∅:D[26.177] → [23.202862:202881]
∅:D[29.2926] → [23.202862:202881]
B:BD[23.202862] → [23.202862:202881]
B:BD[23.202881] → [29.2927:2956]
∅:D[29.2956] → [23.202881:202882]
B:BD[23.202881] → [23.202881:202882]
```
    int   i,j;
    int   count_c;
    short count_s;
    unsigned short count_p;
```
Replacement in crawl-ref/source/tags.cc at line 1562 [23.164589]
B:BD[23.202916] → [26.178:213]
```
    count_c = unmarshallShort(th);
```
[23.202916]
[26.213]
```
    int count_c = unmarshallShort(th);
```
Replacement in crawl-ref/source/tags.cc at line 1564 [23.164589]
∅:D[26.251] → [23.202950:202984]
B:BD[23.202950] → [23.202950:202984]
```
    for (j = 0; j < count_c; ++j)
```
[26.251]
[26.252]
```
    for (int j = 0; j < count_c; ++j)
```
Replacement in crawl-ref/source/tags.cc at line 1574 [23.164589]
B:BD[23.203099] → [23.203099:203133]
```
    for (j = 0; j < count_c; ++j)
```
[23.203099]
[28.1959]
```
    for (int j = 0; j < count_c; ++j)
```
Replacement in crawl-ref/source/tags.cc at line 1580 [23.164589]
B:BD[23.203266] → [23.203266:203301]
∅:D[24.2620] → [23.203301:203335]
B:BD[23.203301] → [23.203301:203335]
∅:D[24.2661] → [23.203341:203379]
B:BD[23.203341] → [23.203341:203379]
B:BD[23.203492] → [23.203492:203550]
```
    count_s = unmarshallShort(th);
    for (i = 0; i < count_s; ++i)
        for (j = 0; j < count_c; ++j)
            tmp_file_pairs[i][j] = unmarshallBoolean(th);
```
[24.2519]
[30.2534]
```
    unmarshallSet(th, Generated_Levels, unmarshall_level_id);
```

Replacement in crawl-ref/source/tags.cc at line 1603 [23.164589]

B:BD[29.3143] → [29.3143:3195]

    count_p = (unsigned short) unmarshallShort(th);

[29.3143]

[29.3195]

    unsigned short count_p = (unsigned short) unmarshallShort(th);

Replacement in crawl-ref/source/tags.cc at line 1608 [23.164589]
B:BD[29.3343] → [29.3343:3377]
```
    for (i = 0; i < count_p; i++)
```
[29.3343]
[29.3377]
```
    for (int i = 0; i < count_p; i++)
```

Replacement in crawl-ref/source/player.cc at line 6960 [23.962854]

B:BD[29.5963] → [29.5963:6006]

        ASSERT(num_visits <= levels_seen);

[29.5963]

[29.6006]

        // Ziggurats can allow a player to return to the same
        // Pandemonium level.
        // ASSERT(num_visits <= levels_seen);
        ;

Replacement in crawl-ref/source/ouch.cc at line 1010 [23.1104358]

B:BD[23.1129106] → [23.1129106:1129159]

    for (int level = 0; level < MAX_LEVELS; level++)

[23.1129106]

[23.1129159]

    for (level_id_set::const_iterator i = Generated_Levels.begin();
         i != Generated_Levels.end(); ++i)

Replacement in crawl-ref/source/ouch.cc at line 1013 [23.1104358]

B:BD[23.1129165] → [24.3054:3119]

∅:D[24.3119] → [23.1129230:1129302]

B:BD[23.1129230] → [23.1129230:1129302]

B:BD[23.1129302] → [31.177:397]

∅:D[31.397] → [23.1129447:1129471]

∅:D[32.527] → [23.1129447:1129471]

∅:D[33.367598] → [23.1129447:1129471]

B:BD[23.1129447] → [23.1129447:1129471]

        for (int dungeon = 0; dungeon < NUM_BRANCHES; dungeon++)
        {
            if (tmp_file_pairs[level][dungeon])
            {
                unlink(
                    make_filename( you.your_name, level,
                                   static_cast<branch_type>(dungeon),
                                   LEVEL_DUNGEON, false ).c_str() );
            }
        }

[23.1129165]

[23.1129471]

        const level_id &place(*i);
        unlink(
            make_filename( you.your_name,
                           place.absdepth(),
                           place.branch,
                           place.level_type,
                           false ).c_str() );

Replacement in crawl-ref/source/ouch.cc at line 1042 [23.1104358]

B:BD[23.1129994] → [34.6083:6136]

        ".st", ".kil", ".tc", ".nts", ".tut", ".sav"

[23.1129994]

[33.367867]

        ".st", ".kil", ".tc", ".nts", ".tut", ".sav", ".msg"

Replacement in crawl-ref/source/newgame.cc at line 1270 [23.1132300]
B:BD[23.1152852] → [35.10493:10525]
```
    tmp_file_pairs.init(false);
```
[23.1152852]
[36.9155]
```
    Generated_Levels.clear();
```

Insertion in crawl-ref/source/misc.cc at line 1513 [23.1933596]

[37.2712]

[38.4213]

}
static void _player_change_level_reset()
{
    you.prev_targ  = MHITNOT;
    if (you.pet_target != MHITYOU)
        you.pet_target = MHITNOT;
    you.prev_grd_targ = coord_def(0, 0);
}
static level_id _stair_destination_override()
{
    const std::string force_place =
        env.markers.property_at(you.pos(), MAT_ANY, "dstplace");
    if (!force_place.empty())
    {
        try
        {
            const level_id place = level_id::parse_level_id(force_place);
            return (place);
        }
        catch (const std::string &err)
        {
            end(1, false, "Marker set with invalid level name: %s",
                force_place.c_str());
        }
    }
    const level_id invalid;
    return (invalid);
}
static bool _stair_force_destination(const level_id &override)
{
    if (override.is_valid())
    {
        if (override.level_type == LEVEL_DUNGEON)
        {
            you.where_are_you = override.branch;
            you.your_level    = override.absdepth();
            you.level_type    = override.level_type;
        }
        else
        {
            you.level_type = override.level_type;
        }
        return (true);
    }
    return (false);
}
static void _player_change_level_upstairs(dungeon_feature_type stair_find,
                                          const level_id &place_override)
{
    if (_stair_force_destination(place_override))
        return;
    if (you.level_type == LEVEL_DUNGEON)
        you.your_level--;
    // Make sure we return to our main dungeon level... labyrinth entrances
    // in the abyss or pandemonium are a bit trouble (well the labyrinth does
    // provide a way out of those places, its really not that bad I suppose).
    if (level_type_exits_up(you.level_type))
        you.level_type = LEVEL_DUNGEON;
    if (player_in_branch( BRANCH_VESTIBULE_OF_HELL ))
    {
        you.where_are_you = BRANCH_MAIN_DUNGEON;
        you.your_level = you.hell_exit;
    }
    if (player_in_hell())
    {
        you.where_are_you = BRANCH_VESTIBULE_OF_HELL;
        you.your_level = 27;
    }
    // Did we take a branch stair?
    for (int i = 0; i < NUM_BRANCHES; ++i)
    {
        if (branches[i].exit_stairs == stair_find
            && you.where_are_you == i)
        {
            you.where_are_you = branches[i].parent_branch;
            // If leaving a branch which wasn't generated in this
            // particular game (like the Swamp or Shoals), then
            // its startdepth is set to -1; compensate for that,
            // so we don't end up on "level -1".
            if (branches[i].startdepth == -1)
                you.your_level += 2;
            break;
        }
    }

Deletion in crawl-ref/source/misc.cc at line 1634 [23.1933596]

B:BD[39.16412] → [39.16412:16541]


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

Replacement in crawl-ref/source/misc.cc at line 1662 [23.1933596]

B:BD[23.1945025] → [23.1945025:1945053]

    if (you.your_level == 0

[23.1945025]

[40.2887]

    const level_id destination_override(_stair_destination_override());
    const bool leaving_dungeon =
        level_id::current() == level_id(BRANCH_MAIN_DUNGEON, 1)
        && !destination_override.is_valid();
    if (leaving_dungeon

Replacement in crawl-ref/source/misc.cc at line 1677 [23.1933596]
∅:D[41.830] → [32.1978:2015]
∅:D[36.18911] → [32.1978:2015]
B:BD[23.1945195] → [32.1978:2015]
```
    int old_level  = you.your_level;
```
[36.18911]
[7.248685]
```
    const int old_level  = you.your_level;
```

Insertion in crawl-ref/source/misc.cc at line 1682 [23.1933596]

[7.248887]

[7.249078]

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

Replacement in crawl-ref/source/misc.cc at line 1688 [23.1933596]

B:BD[23.1945242] → [23.1945242:1945318]

B:BD[23.1945318] → [42.11270:11348]

B:BD[42.11348] → [43.7113:7191]

∅:D[43.7191] → [44.8979:9024]

B:BD[23.1945469] → [44.8979:9024]

∅:D[44.9024] → [23.1945518:1945558]

B:BD[23.1945518] → [23.1945518:1945558]

    // Make sure we return to our main dungeon level... labyrinth entrances
    // in the abyss or pandemonium are a bit trouble (well the labyrinth does
    // provide a way out of those places, its really not that bad I suppose).
    if (level_type_exits_up(you.level_type))
        you.level_type = LEVEL_DUNGEON;

[23.1945242]

[23.1945596]

    _player_change_level_reset();
    _player_change_level_upstairs(stair_find, destination_override);

Deletion in crawl-ref/source/misc.cc at line 1691 [23.1933596]
B:BD[23.1945597] → [23.1945597:1945636]
```
    you.your_level--;
    int i = 0;
```
Replacement in crawl-ref/source/misc.cc at line 1695 [23.1933596]
B:BD[23.1945705] → [23.1945705:1945745]
```
        for (i = 0; i < ENDOFPACK; i++)
```
[23.1945705]
[23.1945745]
```
        for (int i = 0; i < ENDOFPACK; i++)
```
Deletion in crawl-ref/source/misc.cc at line 1706 [23.1933596]
B:BD[23.1945992] → [23.1945992:1945993]
B:BD[23.1945993] → [45.10074:10104]
B:BD[45.10104] → [46.2904:2973]
```
    you.prev_targ  = MHITNOT;
    if (you.pet_target != MHITYOU)
        you.pet_target = MHITNOT;
```

Replacement in crawl-ref/source/misc.cc at line 1707 [23.1933596]

B:BD[45.10106] → [45.10106:10147]

∅:D[45.10147] → [23.1946076:1946131]

B:BD[23.1946076] → [23.1946076:1946131]

    you.prev_grd_targ = coord_def(0, 0);
    if (player_in_branch( BRANCH_VESTIBULE_OF_HELL ))

[45.10106]

[23.1946131]

    if (old_level_id.branch == BRANCH_VESTIBULE_OF_HELL
        && !player_in_branch( BRANCH_VESTIBULE_OF_HELL ))

Deletion in crawl-ref/source/misc.cc at line 1711 [23.1933596]

B:BD[23.1946206] → [23.1946206:1946462]

        you.where_are_you = BRANCH_MAIN_DUNGEON;
        you.your_level = you.hell_exit;
        stair_find = DNGN_STONE_STAIRS_UP_I;
    }
    if (player_in_hell())
    {
        you.where_are_you = BRANCH_VESTIBULE_OF_HELL;
        you.your_level = 27;

Replacement in crawl-ref/source/misc.cc at line 1713 [23.1933596]

B:BD[23.1946469] → [43.7192:7227]

B:BD[43.7227] → [40.2966:3005]

    // Did we take a branch stair?
    for (i = 0; i < NUM_BRANCHES; ++i)

[23.1946469]

[23.1946493]

    // Fixup exits from the Hell branches.
    if (player_in_branch(BRANCH_VESTIBULE_OF_HELL))

Replacement in crawl-ref/source/misc.cc at line 1716 [23.1933596]
B:BD[23.1946499] → [40.3006:3057]
```
        if (branches[i].exit_stairs == stair_find)
```
[23.1946499]
[24.7522]
```
        switch (old_level_id.branch)
```

Replacement in crawl-ref/source/misc.cc at line 1718 [23.1933596]

B:BD[24.7636] → [24.7636:7695]

B:BD[24.7695] → [47.1240:1568]

            you.where_are_you = branches[i].parent_branch;
            // If leaving a branch which wasn't generated in this
            // particular game (like the Swamp or Shoals), then
            // its startdepth is set to -1; compensate for that,
            // so we don't end up on "level -1".
            if (branches[i].startdepth == -1)
                you.your_level += 2;

[24.7532]

[24.7695]

        case BRANCH_COCYTUS:
            stair_find = DNGN_ENTER_COCYTUS;
            break;
        case BRANCH_DIS:
            stair_find = DNGN_ENTER_DIS;
            break;
        case BRANCH_GEHENNA:
            stair_find = DNGN_ENTER_GEHENNA;
            break;
        case BRANCH_TARTARUS:
            stair_find = DNGN_ENTER_TARTARUS;
            break;
        default:

Insertion in crawl-ref/source/misc.cc at line 1877 [23.1933596]

[3.3307]

[48.10783]

// All changes to you.level_type, you.where_are_you and you.your_level
// for descending stairs should happen here.
static void _player_change_level_downstairs(
    dungeon_feature_type stair_find,
    const level_id &place_override,
    bool shaft,
    int shaft_level,
    const level_id &shaft_dest)
{
    if (_stair_force_destination(place_override))
        return;
    const level_area_type original_level_type(you.level_type);
    if (you.level_type != LEVEL_DUNGEON
        && (you.level_type != LEVEL_PANDEMONIUM
            || stair_find != DNGN_TRANSIT_PANDEMONIUM)
        && (you.level_type != LEVEL_PORTAL_VAULT
            || !grid_is_stone_stair(stair_find)))
    {
        you.level_type = LEVEL_DUNGEON;
    }
    if (stair_find == DNGN_ENTER_HELL)
    {
        you.where_are_you = BRANCH_VESTIBULE_OF_HELL;
        you.hell_exit = you.your_level;
        you.your_level = 26;
    }
    // Welcome message.
    // Try to find a branch stair.
    for (int i = 0; i < NUM_BRANCHES; ++i)
    {
        if (branches[i].entry_stairs == stair_find)
        {
            you.where_are_you = branches[i].id;
            break;
        }
    }
    if (stair_find == DNGN_ENTER_LABYRINTH)
        you.level_type = LEVEL_LABYRINTH;
    else if (stair_find == DNGN_ENTER_ABYSS)
        you.level_type = LEVEL_ABYSS;
    else if (stair_find == DNGN_ENTER_PANDEMONIUM)
        you.level_type = LEVEL_PANDEMONIUM;
    else if (stair_find == DNGN_ENTER_PORTAL_VAULT)
        you.level_type = LEVEL_PORTAL_VAULT;
    if (shaft)
    {
        you.your_level    = shaft_level;
        you.where_are_you = shaft_dest.branch;
    }
    else if (original_level_type == LEVEL_DUNGEON
             && you.level_type == LEVEL_DUNGEON)
    {
        you.your_level++;
    }
}

Deletion in crawl-ref/source/misc.cc at line 1943 [23.1933596]
B:BD[23.1948248] → [23.1948248:1948259]
```
    int i;
```
Replacement in crawl-ref/source/misc.cc at line 1949 [23.1933596]
B:BD[39.17429] → [49.3677:3708]
```
    bool shaft = (!force_stair
```
[39.17429]
[50.26735]
```
    const bool shaft = (!force_stair
```
Insertion in crawl-ref/source/misc.cc at line 1986 [23.1933596]
[39.17730]
[39.17730]

Deletion in crawl-ref/source/misc.cc at line 2034 [23.1933596]

∅:D[37.2935] → [41.873:932]

B:BD[23.1949852] → [41.873:932]

B:BD[41.932] → [51.5289:5350]

B:BD[51.5350] → [36.19035:19036]

∅:D[41.980] → [52.110:254]

∅:D[36.19036] → [52.110:254]

B:BD[23.1949852] → [52.110:254]

B:BD[52.254] → [53.2691:2739]

∅:D[53.2739] → [52.313:378]

B:BD[52.313] → [52.313:378]

B:BD[52.378] → [53.2740:2791]

∅:D[53.2791] → [54.2672:2740]

B:BD[54.2672] → [54.2672:2740]

∅:D[54.2740] → [52.441:510]

∅:D[55.2955] → [52.441:510]

∅:D[56.4533] → [52.441:510]

B:BD[52.441] → [52.441:510]

B:BD[52.510] → [54.2741:2751]

∅:D[54.2751] → [52.510:524]

B:BD[52.510] → [52.510:524]

B:BD[52.524] → [57.49708:50006]

B:BD[57.50006] → [44.9187:9232]

∅:D[44.9232] → [57.50049:50076]

B:BD[57.50049] → [57.50049:50076]

    // All checks are done, the player is on the move now.
    // Fire level-leaving trigger.
    leaving_level_now();
#ifdef DGL_MILESTONES
    if (!force_stair)
    {
        // Not entirely accurate - the player could die before
        // reaching the Abyss.
        if (grd(you.pos()) == DNGN_ENTER_ABYSS)
            mark_milestone("abyss.enter", "entered the Abyss!");
        else if (grd(you.pos()) == DNGN_EXIT_ABYSS
                 && you.char_direction != GDT_GAME_START)
        {
            mark_milestone("abyss.exit", "escaped from the Abyss!");
        }
    }
#endif
    // [ds] Descending into the Labyrinth increments your_level. Going
    // downstairs from a labyrinth implies that you've been banished (or been
    // sent to Pandemonium somehow). Decrementing your_level here is needed
    // to fix this buggy sequence: D:n -> Labyrinth -> Abyss -> D:(n+1).
    if (level_type_exits_up(you.level_type))
        you.your_level--;

Insertion in crawl-ref/source/misc.cc at line 2054 [23.1933596]

[39.18993]

[43.7344]

    const level_id destination_override(_stair_destination_override());
    // All checks are done, the player is on the move now.
    // Fire level-leaving trigger.
    leaving_level_now();
#ifdef DGL_MILESTONES
    if (!force_stair)
    {
        // Not entirely accurate - the player could die before
        // reaching the Abyss.
        if (grd(you.pos()) == DNGN_ENTER_ABYSS)
            mark_milestone("abyss.enter", "entered the Abyss!");
        else if (grd(you.pos()) == DNGN_EXIT_ABYSS
                 && you.char_direction != GDT_GAME_START)
        {
            mark_milestone("abyss.exit", "escaped from the Abyss!");
        }
    }
#endif

Deletion in crawl-ref/source/misc.cc at line 2088 [23.1933596]
∅:D[36.19038] → [32.2131:2219]
B:BD[19.14612] → [32.2131:2219]
B:BD[32.2219] → [58.3630:3784]
∅:D[32.2275] → [23.1950871:1950877]
∅:D[58.3784] → [23.1950871:1950877]
B:BD[23.1950871] → [23.1950871:1950877]
B:BD[23.1950959] → [23.1950959:1951006]
B:BD[23.1951006] → [45.10148:10178]
B:BD[45.10178] → [46.2974:3043]
∅:D[46.3043] → [45.10179:10221]
B:BD[23.1951089] → [45.10179:10221]
∅:D[45.10221] → [23.1951089:1951229]
B:BD[23.1951089] → [23.1951089:1951229]
B:BD[23.1951303] → [23.1951303:1951304]
B:BD[23.1951321] → [24.7776:7805]
∅:D[24.7805] → [23.1951362:1951369]
B:BD[23.1951362] → [23.1951362:1951369]
B:BD[23.1951369] → [43.7376:7435]
∅:D[43.7435] → [59.1085:1118]
B:BD[24.7863] → [59.1085:1118]
B:BD[59.1118] → [40.3096:3135]
∅:D[40.3135] → [23.1951569:1951575]
∅:D[24.7904] → [23.1951569:1951575]
B:BD[23.1951569] → [23.1951569:1951575]
B:BD[23.1951575] → [40.3136:3188]
∅:D[40.3188] → [23.1951782:1951792]
∅:D[24.7959] → [23.1951782:1951792]
B:BD[23.1951782] → [23.1951782:1951792]
B:BD[23.1951792] → [59.1119:1154]
∅:D[59.1154] → [24.8132:8180]
B:BD[24.8132] → [24.8132:8180]
∅:D[24.8180] → [23.1953988:1954007]
B:BD[23.1953988] → [23.1953988:1954007]
B:BD[23.1954430] → [23.1954430:1954440]
B:BD[23.1954440] → [24.8181:8187]
∅:D[24.8187] → [23.1954440:1954441]
B:BD[23.1954440] → [23.1954440:1954441]
```
    if (you.level_type != LEVEL_DUNGEON
        && (you.level_type != LEVEL_PANDEMONIUM
            || stair_find != DNGN_TRANSIT_PANDEMONIUM)
        && (you.level_type != LEVEL_PORTAL_VAULT
            || !grid_is_stone_stair(stair_find)))
    {
        you.level_type = LEVEL_DUNGEON;
    }
    you.prev_targ  = MHITNOT;
    if (you.pet_target != MHITYOU)
        you.pet_target = MHITNOT;
    you.prev_grd_targ = coord_def(0, 0);
    if (stair_find == DNGN_ENTER_HELL)
    {
        you.where_are_you = BRANCH_VESTIBULE_OF_HELL;
        you.hell_exit = you.your_level;
        you.your_level = 26;
    }
    // Welcome message.
    // Try to find a branch stair.
    bool entered_branch = false;
    for (i = 0; i < NUM_BRANCHES; ++i)
    {
        if (branches[i].entry_stairs == stair_find)
        {
            entered_branch = true;
            you.where_are_you = branches[i].id;
            break;
        }
    }
```

Replacement in crawl-ref/source/misc.cc at line 2097 [23.1933596]

B:BD[44.9691] → [44.9691:9735]

B:BD[44.9741] → [44.9741:9783]

∅:D[44.9789] → [23.1954617:1954662]

B:BD[23.1954617] → [23.1954617:1954662]

B:BD[23.1954668] → [23.1954668:1954706]

B:BD[23.1954712] → [23.1954712:1954763]

B:BD[23.1954769] → [23.1954769:1954813]

B:BD[23.1954819] → [60.1783:1835]

B:BD[44.9842] → [60.1836:1881]

    if (stair_find == DNGN_ENTER_LABYRINTH)
        you.level_type = LEVEL_LABYRINTH;
    else if (stair_find == DNGN_ENTER_ABYSS)
        you.level_type = LEVEL_ABYSS;
    else if (stair_find == DNGN_ENTER_PANDEMONIUM)
        you.level_type = LEVEL_PANDEMONIUM;
    else if (stair_find == DNGN_ENTER_PORTAL_VAULT)
        you.level_type = LEVEL_PORTAL_VAULT;

[44.9691]

[23.1954819]

    _player_change_level_reset();
    _player_change_level_downstairs(stair_find, destination_override, shaft,
                                    shaft_level, shaft_dest);

Replacement in crawl-ref/source/misc.cc at line 2109 [23.1933596]

B:BD[23.1955733] → [32.2344:2410]

        mprf( MSGCH_DIAGNOSTICS, "Deleting: %s", lname.c_str() );

[23.1955733]

[23.1955861]

        mprf( MSGCH_WARN, "Deleting: %s", lname.c_str() );

Insertion in crawl-ref/source/misc.cc at line 2113 [23.1933596]

[23.1955874]


    // Did we enter a new branch.
    const bool entered_branch(
        you.where_are_you != old_level_id.branch
        && branches[you.where_are_you].parent_branch == old_level_id.branch);

Deletion in crawl-ref/source/misc.cc at line 2154 [23.1933596]

B:BD[23.1956594] → [39.19705:19866]

∅:D[39.19866] → [23.1956635:1956662]

B:BD[23.1956635] → [23.1956635:1956662]

    if (shaft)
    {
        you.your_level    = shaft_level;
        you.where_are_you = shaft_dest.branch;
    }
    else if (you.level_type == LEVEL_DUNGEON)
        you.your_level++;

Deletion in crawl-ref/source/misc.cc at line 2296 [23.1933596]

B:BD[23.1957831] → [23.1957831:1957832]

B:BD[23.1957832] → [39.20220:20385]

∅:D[39.20385] → [44.10070:10203]

B:BD[44.10070] → [44.10070:10203]

B:BD[44.10203] → [61.3378:3384]

∅:D[61.3384] → [44.10203:10229]

B:BD[44.10203] → [44.10203:10229]

B:BD[44.10229] → [61.3385:3391]


    if (shaft)
    {
        you.your_level    = shaft_level;
        you.where_are_you = shaft_dest.branch;
    }
    else if (level_type_exits_up(you.level_type))
        you.your_level++;
    else if (level_type_exits_down(you.level_type)
             && !level_type_exits_down(old_level_type))
    {
        you.your_level--;
    }

Insertion in crawl-ref/source/luadgn.cc at line 2225 [62.1232]

[8.3959]

    return (1);
}
LUAFN(dgn_level_name)
{
    const level_id lid(_lua_level_id(ls, 1));
    lua_pushstring(ls, lid.describe().c_str());

Insertion in crawl-ref/source/luadgn.cc at line 2494 [62.1232]
[8.5522]
[4.4263]
```
    { "level_name", dgn_level_name },
```
Insertion in crawl-ref/source/files.h at line 18 [23.3082298]
[33.856581]
[23.3082608]
```
#include <set>
```

Replacement in crawl-ref/source/files.h at line 32 [23.3082298]

B:BD[23.3082869] → [24.10798:10864]

extern FixedArray<bool, MAX_LEVELS, NUM_BRANCHES> tmp_file_pairs;

[23.3082869]

[63.10951]

typedef std::set<level_id> level_id_set;
extern level_id_set Generated_Levels;

Replacement in crawl-ref/source/files.cc at line 830 [23.3084589]
∅:D[64.11923] → [65.27450:27490]
B:BD[66.5538] → [65.27450:27490]
∅:D[65.27490] → [66.5579:5679]
B:BD[66.5579] → [66.5579:5679]
```
    if (you.level_type == LEVEL_DUNGEON
        && old_branch == BRANCH_VESTIBULE_OF_HELL
        && stair_taken == DNGN_STONE_STAIRS_UP_I)
```
[64.11923]
[66.5679]
```
    if (stair_taken == DNGN_EXIT_PANDEMONIUM)
```

Deletion in crawl-ref/source/files.cc at line 832 [23.3084589]

B:BD[66.5685] → [64.11924:11979]

∅:D[64.11979] → [66.5739:5869]

B:BD[66.5739] → [66.5739:5869]

        // Leaving hell - look for entry portal first.
        stair_taken = DNGN_ENTER_HELL;
        find_first = false;
    }
    else if (stair_taken == DNGN_EXIT_PANDEMONIUM)
    {

Insertion in crawl-ref/source/files.cc at line 840 [23.3084589]

[66.6074]

[67.709]

    else if (stair_taken == DNGN_EXIT_HELL)
    {
        stair_taken = DNGN_ENTER_HELL;
    }

Replacement in crawl-ref/source/files.cc at line 884 [23.3084589]
∅:D[65.27702] → [66.7352:7409]
B:BD[66.7352] → [66.7352:7409]
```
             && stair_taken <= DNGN_TRANSIT_PANDEMONIUM)
```
[65.27702]
[66.7409]
```
             && stair_taken <= DNGN_ENTER_TARTARUS)
```

Replacement in crawl-ref/source/files.cc at line 886 [23.3084589]

B:BD[66.7415] → [64.12261:12309]

        // When entering a hell or pandemonium.

[66.7415]

[66.7462]

        // Only when entering a hell - when exiting, go back to the
        // entry stair.
        if (player_in_hell())
            stair_taken = DNGN_STONE_STAIRS_UP_I;
    }
    else if (stair_taken == DNGN_EXIT_ABYSS)
    {

Replacement in crawl-ref/source/files.cc at line 1083 [23.3084589]

B:BD[23.3092475] → [23.3092475:3092547]

        if (tmp_file_pairs[you.your_level][you.where_are_you] == false)

[23.3092475]

[23.3092547]

        const level_id current(level_id::current());
        if (Generated_Levels.find(current) == Generated_Levels.end())

Replacement in crawl-ref/source/files.cc at line 1090 [23.3084589]
∅:D[68.4310] → [23.3092699:3092769]
B:BD[23.3092699] → [23.3092699:3092769]
```
            tmp_file_pairs[you.your_level][you.where_are_you] = true;
```
[68.4310]
[23.3092769]
```
            Generated_Levels.insert(current);
```

Replacement in crawl-ref/source/files.cc at line 1110 [23.3084589]

B:BD[23.3096530] → [29.13489:13534]

B:BD[29.13534] → [64.12767:12832]

        if (old_level_type == LEVEL_DUNGEON)
            _save_level( old_level, LEVEL_DUNGEON, old_branch );

[23.3093685]

[23.3096563]

        _save_level( old_level, old_level_type, old_branch );

Replacement in crawl-ref/source/files.cc at line 1140 [23.3084589]

B:BD[56.6374] → [2.2665:2735]

            tmp_file_pairs[you.your_level][you.where_are_you] = true;

[56.6374]

            Generated_Levels.insert(level_id::current());

Replacement in crawl-ref/source/files.cc at line 1662 [23.3084589]

B:BD[21.4041] → [21.4041:4228]

// Given a level in the dungeon (i.e. level_type == LEVEL_DUNGEON),
// returns true if the level has been created already in this game.
// Asserts if the level_type is not LEVEL_DUNGEON.

[21.4041]

[21.4228]

// Given a level returns true if the level has been created already
// in this game.

Replacement in crawl-ref/source/files.cc at line 1666 [23.3084589]

B:BD[21.4276] → [21.4276:4384]

    ASSERT(level.level_type == LEVEL_DUNGEON);
    return (tmp_file_pairs[level.absdepth()][level.branch]);

[21.4276]

[21.4384]

    return (Generated_Levels.find(level) != Generated_Levels.end());

Insertion in crawl-ref/source/externs.h at line 435 [23.3270163]

[23.3274753]


// Identifies a level. Should never include virtual methods or
// dynamically allocated memory (see code to push level_id onto Lua
// stack in luadgn.cc)
class level_id
{
public:
    branch_type branch;     // The branch in which the level is.
    int depth;              // What depth (in this branch - starting from 1)
    level_area_type level_type;
public:
    // Returns the level_id of the current level.
    static level_id current();

Insertion in crawl-ref/source/externs.h at line 451 [23.3270163]

[23.3274754]

    // Returns the level_id of the level that the stair/portal/whatever at
    // 'pos' on the current level leads to.
    static level_id get_next_level_id(const coord_def &pos);

Insertion in crawl-ref/source/externs.h at line 455 [23.3270163]

[23.3274755]

[69.6780]

    level_id()
        : branch(BRANCH_MAIN_DUNGEON), depth(-1),
          level_type(LEVEL_DUNGEON)
    {
    }
    level_id(branch_type br, int dep, level_area_type ltype = LEVEL_DUNGEON)
        : branch(br), depth(dep), level_type(ltype)
    {
    }
    level_id(const level_id &ot)
        : branch(ot.branch), depth(ot.depth), level_type(ot.level_type)
    {
    }
    level_id(level_area_type ltype)
        : branch(BRANCH_MAIN_DUNGEON), depth(-1), level_type(ltype)
    {
    }
    static level_id parse_level_id(const std::string &s) throw (std::string);
    unsigned short packed_place() const;
    std::string describe(bool long_name = false, bool with_number = true) const;
    void clear()
    {
        branch = BRANCH_MAIN_DUNGEON;
        depth  = -1;
        level_type = LEVEL_DUNGEON;
    }
    int absdepth() const;
    bool is_valid() const
    {
        return (branch != NUM_BRANCHES && depth != -1)
            || level_type != LEVEL_DUNGEON;
    }
    const level_id &operator = (const level_id &id)
    {
        branch     = id.branch;
        depth      = id.depth;
        level_type = id.level_type;
        return (*this);
    }
    bool operator == ( const level_id &id ) const
    {
        return (level_type == id.level_type
                && (level_type != LEVEL_DUNGEON
                    || (branch == id.branch && depth == id.depth)));
    }
    bool operator != ( const level_id &id ) const
    {
        return !operator == (id);
    }
    bool operator <( const level_id &id ) const
    {
        if (level_type != id.level_type)
            return (level_type < id.level_type);
        if (level_type != LEVEL_DUNGEON)
            return (false);
        return (branch < id.branch) || (branch==id.branch && depth < id.depth);
    }
    bool operator == ( const branch_type _branch ) const
    {
        return (branch == _branch && level_type == LEVEL_DUNGEON);
    }
    bool operator != ( const branch_type _branch  ) const
    {
        return !operator == (_branch);
    }
    void save(writer&) const;
    void load(reader&);
};

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 26 [58.11554]
B:BD[5.2971] → [5.2971:2989]
```
              end
```
[5.2971]
[5.2989]
```
              end,
    dstplace = zig().origin_level
```
Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 47 [58.11554]
[17.9484]
[5.3102]
```
  z.origin_level = dgn.level_name(dgn.level_id())
```
Deletion in crawl-ref/source/dat/clua/ziggurat.lua at line 415 [58.11554]
B:BD[6.8202] → [6.8202:8203]
∅:D[6.8203] → [17.14850:14917]
B:BD[17.14850] → [17.14850:14917]
```
  crawl.mpr("Ziggurat depth is now " .. zig_depth(), "diagnostic")
```

Allow ziggurats placed in Pandemonium to return to the same Pan level when the player leaves the ziggurat. Breaks saves.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/travel.h at line 181 [7.29464]

Deletion in crawl-ref/source/travel.h at line 182 [7.29464]

Deletion in crawl-ref/source/travel.h at line 183 [7.29464]

Replacement in crawl-ref/source/tags.cc at line 99 [23.164589]

Insertion in crawl-ref/source/tags.cc at line 294 [23.164589]

Insertion in crawl-ref/source/tags.cc at line 366 [23.164589]

Deletion in crawl-ref/source/tags.cc at line 1120 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1122 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1127 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1133 [23.164589]

Deletion in crawl-ref/source/tags.cc at line 1561 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1562 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1564 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1574 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1580 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1603 [23.164589]

Replacement in crawl-ref/source/tags.cc at line 1608 [23.164589]

Replacement in crawl-ref/source/player.cc at line 6960 [23.962854]

Replacement in crawl-ref/source/ouch.cc at line 1010 [23.1104358]

Replacement in crawl-ref/source/ouch.cc at line 1013 [23.1104358]

Replacement in crawl-ref/source/ouch.cc at line 1042 [23.1104358]

Replacement in crawl-ref/source/newgame.cc at line 1270 [23.1132300]

Insertion in crawl-ref/source/misc.cc at line 1513 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 1634 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1662 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1677 [23.1933596]

Insertion in crawl-ref/source/misc.cc at line 1682 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1688 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 1691 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1695 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 1706 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1707 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 1711 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1713 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1716 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1718 [23.1933596]

Insertion in crawl-ref/source/misc.cc at line 1877 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 1943 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 1949 [23.1933596]

Insertion in crawl-ref/source/misc.cc at line 1986 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 2034 [23.1933596]

Insertion in crawl-ref/source/misc.cc at line 2054 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 2088 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 2097 [23.1933596]

Replacement in crawl-ref/source/misc.cc at line 2109 [23.1933596]

Insertion in crawl-ref/source/misc.cc at line 2113 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 2154 [23.1933596]

Deletion in crawl-ref/source/misc.cc at line 2296 [23.1933596]

Insertion in crawl-ref/source/luadgn.cc at line 2225 [62.1232]

Insertion in crawl-ref/source/luadgn.cc at line 2494 [62.1232]

Insertion in crawl-ref/source/files.h at line 18 [23.3082298]

Replacement in crawl-ref/source/files.h at line 32 [23.3082298]

Replacement in crawl-ref/source/files.cc at line 830 [23.3084589]

Deletion in crawl-ref/source/files.cc at line 832 [23.3084589]

Insertion in crawl-ref/source/files.cc at line 840 [23.3084589]

Replacement in crawl-ref/source/files.cc at line 884 [23.3084589]

Replacement in crawl-ref/source/files.cc at line 886 [23.3084589]

Replacement in crawl-ref/source/files.cc at line 1083 [23.3084589]

Replacement in crawl-ref/source/files.cc at line 1090 [23.3084589]