fiddlerwoaroof/crawl - Change 7UQJTYJTHTDW55ZUKG4TINZTNALGPK5CB7UB7PJ2Y2SKQ5XOYP5AC

[1769972] Better handling of rogue markers.

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

Created by dshaligram on August 9, 2007

7UQJTYJTHTDW55ZUKG4TINZTNALGPK5CB7UB7PJ2Y2SKQ5XOYP5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/dungeon.cc at line 6827 [5.3429798]

B:BD[3.157799] → [4.2810:2860]

static coord_def dgn_find_labyrinth_entry_point()

[3.157799]

[4.2860]

static coord_def dgn_find_feature_marker(dungeon_feature_type feat)

Replacement in crawl-ref/source/dungeon.cc at line 6834 [5.3429798]

B:BD[4.3071] → [4.3071:3169]

            && dynamic_cast<map_feature_marker*>(mark)->feat
            == DNGN_ENTER_LABYRINTH)

[4.3071]

[4.3169]

            && dynamic_cast<map_feature_marker*>(mark)->feat == feat)

Replacement in crawl-ref/source/dungeon.cc at line 6840 [5.3429798]

B:BD[2.354] → [2.354:376]

    return (unfound);

[2.354]

[4.3253]

    return (unfound);    
}
static coord_def dgn_find_labyrinth_entry_point()
{
    return (dgn_find_feature_marker(DNGN_ENTER_LABYRINTH));

Insertion in crawl-ref/source/dungeon.cc at line 6851 [5.3429798]

[6.5257]

#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS,
         "Level entry point on %sstair: %d (%s)",
         find_closest? "closest " : "",
         stair_to_find,
         dungeon_feature_name(stair_to_find));
#endif

Insertion in crawl-ref/source/dungeon.cc at line 6880 [5.3429798]

[6.5489]

    if (stair_to_find == your_branch().exit_stairs)
    {
        const coord_def pos(dgn_find_feature_marker(DNGN_STONE_STAIRS_UP_I));
        if (in_bounds(pos) && grd(pos) == stair_to_find)
            return (pos);
    }

Deletion in crawl-ref/source/dungeon.cc at line 6890 [5.3429798]
B:BD[6.5590] → [7.5742:5816]
```
    const bool branch_exit = stair_to_find == your_branch().exit_stairs;
```

Replacement in crawl-ref/source/dungeon.cc at line 6924 [5.3429798]

B:BD[6.6596] → [7.5817:5899]

B:BD[7.5899] → [8.34763:34825]

∅:D[8.34825] → [7.5961:6015]

B:BD[7.5961] → [7.5961:6015]

            if (grd[xpos][ypos] == stair_to_find
                && (!branch_exit
                    || env_find_marker(coord_def(xpos, ypos),
                                       MAT_FEATURE)))

[6.6596]

[6.6646]

            if (grd[xpos][ypos] == stair_to_find)

Replacement in crawl-ref/source/direct.cc at line 1739 [5.3697945]

B:BD[9.4479] → [9.4479:4520]

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

[9.4479]

[10.2262]

    const dungeon_feature_type feat = grd[mx][my];
    mprf("(%d,%d): %s - %s (%d/%s)%s%s", mx, my,

Insertion in crawl-ref/source/direct.cc at line 1743 [5.3697945]
[11.21088]
[9.4521]
```
         feat,
         dungeon_feature_name(feat),
```