fiddlerwoaroof/crawl - Change QAG3ZYLCAYC7SX5DY5ZVEEFRIJTUBFHDOFRGK6DA2FF2AQNMEWLAC

[2499508] Left-clicking on the minimap now behaves identically to left-clicking on the dungeon (in both travel behavior and shift/ctrl-clicking.)

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

Created by ennewalker on January 11, 2009

QAG3ZYLCAYC7SX5DY5ZVEEFRIJTUBFHDOFRGK6DA2FF2AQNMEWLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilereg.cc at line 788 [3.54399]

[2.673]


static int _click_travel(const coord_def &gc, MouseEvent &event)
{
    if (!in_bounds(gc))
        return 0;
    int cmd = _adjacent_cmd(gc, event);
    if (cmd)
        return cmd;

Insertion in crawl-ref/source/tilereg.cc at line 798 [3.54399]

[2.674]

[3.80436]

    if (i_feel_safe())
    {
        start_travel(gc);
        return CK_MOUSE_CMD;
    }
    // If not safe, then take one step towards the click.
    travel_pathfind tp;
    tp.set_src_dst(you.pos(), gc);
    const coord_def dest = tp.pathfind(RMODE_TRAVEL);
    if (!dest.x && !dest.y)
        return 0;
    return _adjacent_cmd(dest, event);
}

Deletion in crawl-ref/source/tilereg.cc at line 905 [3.54399]
B:BD[3.82585] → [3.82585:82604]
B:BD[3.82604] → [2.675:699]
```
        return 0;
    if (!in_bounds(gc))
```
Deletion in crawl-ref/source/tilereg.cc at line 906 [3.54399]
B:BD[2.717] → [2.717:815]
∅:D[2.815] → [3.82753:82759]
B:BD[3.82753] → [3.82753:82759]
B:BD[3.82759] → [2.816:871]
∅:D[2.871] → [3.83043:83049]
B:BD[3.83043] → [3.83043:83049]
```
    int cmd = _adjacent_cmd(gc, event);
    if (cmd)
        return cmd;
    if (i_feel_safe())
    {
        start_travel(gc);
        return CK_MOUSE_CMD;
    }
```

Replacement in crawl-ref/source/tilereg.cc at line 907 [3.54399]

B:BD[3.83050] → [2.872:1072]

∅:D[2.1072] → [3.83113:83131]

B:BD[3.83113] → [3.83113:83131]

∅:D[4.14905] → [3.83186:83187]

B:BD[3.83186] → [3.83186:83187]

B:BD[3.83187] → [2.1073:1112]

    // If not safe, then take one step towards the click.
    travel_pathfind tp;
    tp.set_src_dst(you.pos(), gc);
    const coord_def dest = tp.pathfind(RMODE_TRAVEL);
    if (!dest.x && !dest.y)
        return 0;
    return _adjacent_cmd(dest, event);

[3.83050]

[3.83212]

    return _click_travel(gc, event);

Replacement in crawl-ref/source/tilereg.cc at line 1907 [3.54399]

B:BD[3.112004] → [3.112004:112063]

B:BD[3.112063] → [4.14906:14936]

            if (!in_bounds(gc))
                return 0;
            start_travel(gc);

[3.112004]

[3.112101]

            return _click_travel(gc, event);