fiddlerwoaroof/crawl - Change R6Y4GB7H6DJ373ZBZKLGTOMAS2IZAHNVJVO2FMYEAZGQYHVURPMQC

And put it in the right place again.

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

Created by dolorous on May 24, 2008

R6Y4GB7H6DJ373ZBZKLGTOMAS2IZAHNVJVO2FMYEAZGQYHVURPMQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/fight.cc at line 520 [5.3140790]

B:BD[4.32720] → [3.2661:3164]

    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);
            }
        }
    }

Insertion in crawl-ref/source/fight.cc at line 610 [5.3140790]

[6.3192]

[7.2703]

        const bool inSanctuary   = (is_sanctuary(you.x_pos, you.y_pos)
                                       || is_sanctuary(def->x, def->y));

Replacement in crawl-ref/source/fight.cc at line 618 [5.3140790]
B:BD[8.2798] → [7.2982:3005]
```
        if (wontAttack
```
[8.2798]
[7.3005]
```
        if (inSanctuary || wontAttack
```

Replacement in crawl-ref/source/fight.cc at line 622 [5.3140790]

B:BD[7.3150] → [2.2661:2737]

            snprintf(info, INFO_SIZE, "Really attack this %s%s%screature?",

[7.3150]

[9.2738]

            snprintf(info, INFO_SIZE, "Really attack the %s%s%s%s%s?",

Insertion in crawl-ref/source/fight.cc at line 630 [5.3140790]

[2.2802]

[7.3628]

                                                      : "",
                                      def->name(DESC_PLAIN).c_str(),
                                      (inSanctuary)   ? ", despite your sanctuary"