fiddlerwoaroof/crawl - Change Y6YNQ3Q7CYMDJZSHZ4XYKQJMIFORHWBQGDWXKZ4R5PH2NFWY6N5AC

And put it back in, in the proper place.

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

Created by dolorous on May 24, 2008

Y6YNQ3Q7CYMDJZSHZ4XYKQJMIFORHWBQGDWXKZ4R5PH2NFWY6N5AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/beam.cc at line 4178 [4.4128068]

[3.9153]

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

Replacement in crawl-ref/source/beam.cc at line 4189 [4.4128068]

B:BD[5.5189] → [6.2867:2969]

∅:D[6.2969] → [5.5250:5303]

B:BD[5.5250] → [5.5250:5303]

        snprintf(info, INFO_SIZE, "Really fire %s %s?",
                 (target ? "at" : "through"),
                 mon->name(DESC_NOCAP_THE).c_str());

[5.5189]

[5.5303]

        snprintf(info, INFO_SIZE, "Really fire %s %s%s?",
                 (target)      ? "at"
                               : "through",
                 mon->name(DESC_NOCAP_THE).c_str(),
                 (inSanctuary) ? ", despite your sanctuary"
                               : "");

Replacement in crawl-ref/source/beam.cc at line 4199 [4.4128068]
B:BD[5.5374] → [5.5374:5398]
```
    else if (wontAttack
```
[5.5374]
[5.5398]
```
    else if (inSanctuary || wontAttack
```

Replacement in crawl-ref/source/beam.cc at line 4205 [4.4128068]

B:BD[5.5678] → [2.2762:2828]

∅:D[2.2828] → [6.3036:3082]

∅:D[7.2830] → [6.3036:3082]

B:BD[6.3036] → [6.3036:3082]

        snprintf(info, INFO_SIZE, "Really fire %s the %s%s%s%s?",
                 (target ? "at" : "through"),

[5.5678]

[3.9692]

        snprintf(info, INFO_SIZE, "Really fire %s the %s%s%s%s%s?",
                 (target)        ? "at"
                                 : "through",

Replacement in crawl-ref/source/beam.cc at line 4216 [4.4128068]

B:BD[5.5826] → [2.2829:2878]

                 mon->name(DESC_PLAIN).c_str());

[5.5826]

[3.10047]

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