fiddlerwoaroof/crawl - Change KEYDQXH4RGVV7HS5RRPNYOWQQGFVWIXFE2D2WS77FSV3QM3F5A7QC

Handle the warning prompt for melee attacks while in a sanctuary in

melee_attack::attack() instead of _move_player(), so that melee attacks made using Ctrl-key sequences also show it.

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

Created by dolorous on May 24, 2008

KEYDQXH4RGVV7HS5RRPNYOWQQGFVWIXFE2D2WS77FSV3QM3F5A7QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/fight.cc at line 520 [6.3140790]

[4.32720]

[5.57076]

    if (attacker->atype() == ACT_PLAYER && defender->atype() == ACT_MONSTER)
    {
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(def->x, def->y))
        {
            snprintf(info, INFO_SIZE,
                     "Really attack %s, despite your sanctuary?",
                     def->name(DESC_NOCAP_THE).c_str());
            if (!yesno(info, true, 'n'))
            {
                cancel_attack = true;
                return (false);
            }
        }
    }

Deletion in crawl-ref/source/acr.cc at line 4221 [6.4397395]

B:BD[7.1281245] → [8.19227:19383]

B:BD[8.19383] → [2.3597:3667]

∅:D[2.3667] → [8.19454:19515]

B:BD[8.19454] → [8.19454:19515]

B:BD[8.19515] → [3.3364:3365]

∅:D[3.3365] → [8.19541:19629]

B:BD[8.19541] → [8.19541:19629]

            if (is_sanctuary(you.x_pos, you.y_pos)
                || is_sanctuary(mon->x, mon->y))
            {
                snprintf(info, INFO_SIZE,
                         "Really attack %s, despite your sanctuary?",
                         mon->name(DESC_NOCAP_THE).c_str());
                if (!yesno(info, true, 'n'))
                    return;
            }