fiddlerwoaroof/crawl - Change FCPBRFLI4FHMB3Q4AFIYPG22ALFOLIYFBODHNCW5O6PVMMD65YDQC

[2010192] Fixing issue where cancelling a ranged attack (e.g. "Really fire on...?") wouldn't really cancel the attack. Also, s/beam_stopped/beam_cancelled/ for clarity.

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

Created by ennewalker on July 5, 2008

FCPBRFLI4FHMB3Q4AFIYPG22ALFOLIYFBODHNCW5O6PVMMD65YDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 1915 [4.2781507]
B:BD[3.5471] → [3.5471:5503]
```
        if (pbolt.fr_count > 0)
```
[3.5471]
[3.5503]
```
        if (pbolt.fr_count > 0 || pbolt.beam_cancelled)
```

Replacement in crawl-ref/source/beam.h at line 151 [4.4124541]

B:BD[5.107956] → [2.2770:2841]

    bool        beam_stopped;    // stop_attack_prompt() returned true

[5.107956]

[2.2841]

    bool        beam_cancelled;  // stop_attack_prompt() returned true

Replacement in crawl-ref/source/beam.cc at line 704 [4.4128068]
B:BD[6.30110] → [2.3283:3316]
```
    pbolt.beam_stopped  = false;
```
[6.30110]
[2.3316]
```
    pbolt.beam_cancelled= false;
```
Replacement in crawl-ref/source/beam.cc at line 711 [4.4128068]
B:BD[6.30244] → [2.3371:3399]
```
    if (pbolt.beam_stopped)
```
[6.30244]
[6.30272]
```
    if (pbolt.beam_cancelled)
```

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

[6.30278]

[6.30278]

#if DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS, "%s", "Beam stopped.");
#endif

Insertion in crawl-ref/source/beam.cc at line 1939 [4.4128068]
[4.4176783]
[4.4176783]
```
        if (pbolt.beam_cancelled)
            return;
```

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

B:BD[7.10695] → [2.3588:3638]

                        beam.beam_stopped = true;

[8.3356]

[8.3399]

                        beam.beam_cancelled = true;

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

B:BD[9.5050] → [2.4005:4051]

                    beam.beam_stopped = true;

[9.5050]

[9.5089]

                    beam.beam_cancelled = true;

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

B:BD[2.4603] → [2.4603:4681]

               beam_stopped(false), dont_stop_foe(false), dont_stop_fr(false)

[2.4603]

[10.1514]

               beam_cancelled(false), dont_stop_foe(false), dont_stop_fr(false)