fiddlerwoaroof/crawl - Change FFTLO4E55WG64QGFHKKQYH7AFLQNIQKYRDP5JQ72LHZEORSS3DWAC

[2013519] Fixing auto-travel problems. There were two issues here. One was that going up stairs wasn't updating the correct stair on the previous level. Secondly, sync_branch_stairs was destroying that update anyway. Added a "clear_branch_stairs" function to clear stair info when leaving the vestibule. I am nearly sure this should fix all of the hellish travel issues, but it probably deserves some testing.

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

Created by ennewalker on July 11, 2008

FFTLO4E55WG64QGFHKKQYH7AFLQNIQKYRDP5JQ72LHZEORSS3DWAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.h at line 489 [4.29464]

[4.37654]

[3.326]

    // Clears all stair info for stairs matching this grid type.
    void clear_stairs(dungeon_feature_type grid);

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

[5.1732]


void LevelInfo::clear_stairs(dungeon_feature_type grid)
{
    for (int i = 0, size = stairs.size(); i < size; ++i)
    {
        stair_info &si = stairs[i];
        if (si.grid != grid)
            continue;

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

[5.1733]

[4.117698]

        si.destination.id.depth = -1;
        si.destination.pos.x = -1;
        si.destination.pos.y = -1;
        si.guessed_pos = true;
    }
}

Insertion in crawl-ref/source/misc.cc at line 1625 [6.1933596]
[2.3123]
[6.1947805]
```
    int stair_x = you.x_pos, stair_y = you.y_pos;
```
Deletion in crawl-ref/source/misc.cc at line 1681 [6.1933596]
B:BD[4.249761] → [7.17293:17352]
```
            int stair_x = you.x_pos, stair_y = you.y_pos;
```

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

B:BD[4.250764] → [4.250764:250870]

                lp.id.depth = -1;
                lp.pos.x = lp.pos.y = -1;
                guess = true;

[4.250764]

[4.250870]

                old_level_info.clear_stairs(DNGN_EXIT_HELL);

Insertion in crawl-ref/source/misc.cc at line 1703 [6.1933596]

[4.250884]

            else
            {
                old_level_info.update_stair(stair_x, stair_y, lp, guess);
            }

Deletion in crawl-ref/source/misc.cc at line 1708 [6.1933596]
B:BD[4.250885] → [7.17353:17427]
∅:D[7.17427] → [4.250955:250956]
B:BD[4.250955] → [4.250955:250956]
```
            old_level_info.update_stair(you.x_pos, you.y_pos, lp, guess);
```