fiddlerwoaroof/crawl - Change PONOTAV3NEDNVGEJNPMLC5AY2BPV5E3ZHWDLNQCKCEBVKPBIY7QQC

Make tracer beams call stop_attack_prompt() for foes as well as for

friends, to check for attacking foes while in sanctuary. The way it's done means that if you or an enemy is in sanctuary and the beam also passes through an ally then it will prompt you twice, once for the first friend and once for the first foe, but that shouldn't be too much of a problem.

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

Created by zelgadis on July 1, 2008

PONOTAV3NEDNVGEJNPMLC5AY2BPV5E3ZHWDLNQCKCEBVKPBIY7QQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/beam.h at line 151 [5.4124541]

[4.107956]

    bool        beam_stopped;    // stop_attack_prompt() returned true
    bool        dont_stop_foe;   // stop_attack_prompt() returned false for foe
    bool        dont_stop_fr;    // stop_attack_prompt() returned false for
                                 // friend

Replacement in crawl-ref/source/beam.h at line 191 [5.4124541]

B:BD[5.4125698] → [6.3016:3078]

∅:D[6.3078] → [7.766:857]

B:BD[7.766] → [7.766:857]

B:BD[7.857] → [6.3079:3170]

void explosion( bolt &pbolt, bool hole_in_the_middle = false,
                bool explode_in_wall = false,
                bool stop_at_statues = true,
                bool stop_at_walls   = true,
                bool show_more       = true);

[5.4125698]

[5.4125770]

int explosion( bolt &pbolt, bool hole_in_the_middle = false,
               bool explode_in_wall = false,
               bool stop_at_statues = true,
               bool stop_at_walls   = true,
               bool show_more       = true);

Insertion in crawl-ref/source/beam.cc at line 703 [5.4128068]

[8.30110]

    pbolt.beam_stopped  = false;
    pbolt.dont_stop_foe = pbolt.dont_stop_fr = false;

Replacement in crawl-ref/source/beam.cc at line 710 [5.4128068]
B:BD[8.30244] → [3.2771:2799]
```
    if (pbolt.fr_count < 0)
```
[8.30244]
[8.30272]
```
    if (pbolt.beam_stopped)
```

Replacement in crawl-ref/source/beam.cc at line 4343 [5.4128068]

B:BD[5.4234437] → [3.2800:2873]

                if (beam.fr_count == 1 && !_beam_is_harmless(beam, mon))

[5.4234437]

[9.10592]

                if (!_beam_is_harmless(beam, mon)
                    && (beam.fr_count == 1 && !beam.dont_stop_fr
                        || beam.foe_count == 1 && !beam.dont_stop_foe))

Replacement in crawl-ref/source/beam.cc at line 4353 [5.4128068]

B:BD[10.10695] → [3.2874:2923]

                        beam.fr_count = INT_MIN;

[10.10695]

[11.3399]

                        beam.beam_stopped = true;

Insertion in crawl-ref/source/beam.cc at line 4356 [5.4128068]

[11.3465]

[8.34097]

                   if (beam.fr_count == 1 && !beam.dont_stop_fr)
                       beam.dont_stop_fr = true;
                   else
                       beam.dont_stop_foe = true;

Replacement in crawl-ref/source/beam.cc at line 4506 [5.4128068]

B:BD[12.6540] → [3.2924:2993]

            if (beam.fr_count == 1 && !_beam_is_harmless(beam, mon))

[12.6540]

[13.4831]

            if (!_beam_is_harmless(beam, mon)
                && (beam.fr_count == 1 && !beam.dont_stop_fr
                    || beam.foe_count == 1 && !beam.dont_stop_foe))

Replacement in crawl-ref/source/beam.cc at line 4515 [5.4128068]

B:BD[13.5050] → [3.2994:3039]

                    beam.fr_count = INT_MIN;

[13.5050]

[13.5089]

                    beam.beam_stopped = true;

Insertion in crawl-ref/source/beam.cc at line 4518 [5.4128068]

[11.3883]

[13.5130]

                if (beam.fr_count == 1 && !beam.dont_stop_fr)
                    beam.dont_stop_fr = true;
                else
                    beam.dont_stop_foe = true;

Replacement in crawl-ref/source/beam.cc at line 5239 [5.4128068]

∅:D[2.6580] → [7.905:1018]

B:BD[5.4253318] → [7.905:1018]

B:BD[7.1018] → [6.3172:3224]

void explosion( bolt &beam, bool hole_in_the_middle,
                bool explode_in_wall, bool stop_at_statues,
                bool stop_at_walls, bool show_more)

[2.6580]

[5.4253379]

int explosion( bolt &beam, bool hole_in_the_middle,
               bool explode_in_wall, bool stop_at_statues,
               bool stop_at_walls, bool show_more)

Replacement in crawl-ref/source/beam.cc at line 5416 [5.4128068]
B:BD[5.4256266] → [14.741:773]
```
    bool seen_anything = false;
```
[5.4256266]
[14.773]
```
    int cells_seen = 0;
```
Replacement in crawl-ref/source/beam.cc at line 5422 [5.4128068]
∅:D[15.41268] → [14.957:995]
B:BD[14.957] → [14.957:995]
```
                seen_anything = true;
```
[15.41268]
[15.41269]
```
                cells_seen++;
```
Replacement in crawl-ref/source/beam.cc at line 5434 [5.4128068]
B:BD[5.4256496] → [6.3225:3280]
```
    if (!beam.is_tracer && seen_anything && show_more)
```
[5.4256496]
[5.4256520]
```
    if (!beam.is_tracer && cells_seen > 0 && show_more)
```
Insertion in crawl-ref/source/beam.cc at line 5436 [5.4128068]
[5.4256536]
[5.4256536]
```
    return (cells_seen);
```

Replacement in crawl-ref/source/beam.cc at line 5622 [5.4128068]

B:BD[16.1445] → [16.1445:1514]

               attitude(ATT_HOSTILE), foe_ratio(0), chose_ray(false)

[16.1445]

[16.1514]

               attitude(ATT_HOSTILE), foe_ratio(0), chose_ray(false),
               beam_stopped(false), dont_stop_foe(false), dont_stop_fr(false)