fiddlerwoaroof/crawl - Change C4FVDACJIRNJLTWB2PQYCU6PHYNJJ4HYSXFQ4XTSLIDU22UPFOMAC

2056015: allow '^' during branch selection in travel.

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

Created by haranp on September 21, 2008

C4FVDACJIRNJLTWB2PQYCU6PHYNJJ4HYSXFQ4XTSLIDU22UPFOMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 2059 [4.39949]

B:BD[3.1026] → [2.6098:6149]

static int _prompt_travel_branch(int prompt_flags)

[3.1026]

[4.88652]

static int _prompt_travel_branch(int prompt_flags, bool* to_entrance)

Replacement in crawl-ref/source/travel.cc at line 2129 [4.39949]

B:BD[4.90613] → [5.765:828]

        mprf(MSGCH_PROMPT, "Where to? %s", shortcuts.c_str());

[4.90613]

[4.90722]

        mprf(MSGCH_PROMPT, "%s? %s",
             *to_entrance ? "Entrance to where" : "Where to",
             shortcuts.c_str());

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

[4.91203]

        case '^':
            if (*to_entrance)
                return (ID_CANCEL);
            else
            {
                *to_entrance = true;
                return _prompt_travel_branch(prompt_flags, to_entrance);
            }

Replacement in crawl-ref/source/travel.cc at line 2172 [4.39949]

B:BD[6.274] → [6.274:319]

                    std::string msg    = "";

[6.274]

[6.319]

                    std::string msg;

Replacement in crawl-ref/source/travel.cc at line 2341 [4.39949]

B:BD[7.2854] → [2.7471:7533]

static travel_target _prompt_travel_depth(const level_id &id)

[7.2854]

[7.2910]

static travel_target _prompt_travel_depth(const level_id &id,
                                          bool already_entrance)

Replacement in crawl-ref/source/travel.cc at line 2344 [4.39949]

B:BD[7.2912] → [8.129:193]

    travel_target target = travel_target(level_pos(id), false);

[7.2912]

[9.1977]

    travel_target target = travel_target(level_pos(id), already_entrance);

Replacement in crawl-ref/source/travel.cc at line 2348 [4.39949]

B:BD[10.3816] → [10.3816:3879]

        return travel_target(level_id(target.p.id.branch, 1));

[10.3816]

[7.3077]

        return travel_target(level_id(target.p.id.branch, 1), already_entrance);

Replacement in crawl-ref/source/travel.cc at line 2377 [4.39949]

B:BD[10.4361] → [2.7780:7834]

    int branch = _prompt_travel_branch(prompt_flags);

[10.4361]

[3.2684]

    bool to_entrance = false;
    int branch = _prompt_travel_branch(prompt_flags, &to_entrance);

Replacement in crawl-ref/source/travel.cc at line 2413 [4.39949]

B:BD[4.94437] → [2.7913:7961]

    target = _prompt_travel_depth(target.p.id);

[4.94437]

[4.94498]

    target = _prompt_travel_depth(target.p.id, to_entrance);