fiddlerwoaroof/crawl - Change FNY62WM76UGY6IZQYRTRLSBLLUKUHL5N4CG5HQRSWTU2MYIXNJ5QC

Fix 2015315 by not even bothering to prompt for spells with the

SPFLAG_NOT_SELF flag.

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

Created by j-p-e-g on July 11, 2008

FNY62WM76UGY6IZQYRTRLSBLLUKUHL5N4CG5HQRSWTU2MYIXNJ5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.h at line 135 [7.242902]
∅:D[5.187] → [6.177:228]
∅:D[2.266] → [6.177:228]
∅:D[8.7806] → [6.177:228]
B:BD[6.177] → [6.177:228]
```
                      const char *prompt = NULL );
```
[2.266]
[7.245381]
```
                      const char *prompt = NULL, bool cancel_at_self = false );
```

Replacement in crawl-ref/source/spl-util.cc at line 785 [7.245665]

B:BD[2.402] → [2.402:445]

                      const char *prompt )

[2.402]

[7.264740]

                      const char *prompt, bool cancel_at_self )

Replacement in crawl-ref/source/spl-util.cc at line 791 [7.245665]

B:BD[2.508] → [2.508:553]

               may_target_monster, prompt );

[2.508]

[7.264983]

               may_target_monster, prompt, NULL, cancel_at_self );

Replacement in crawl-ref/source/spl-cast.cc at line 1037 [7.293070]

B:BD[9.2907] → [2.557:635]

        if (!spell_direction(spd, beam, dir, targ, needs_path, true, prompt))

[9.2907]

[6.6442]

        if (!spell_direction(spd, beam, dir, targ, needs_path, true, prompt,
                             testbits(flags, SPFLAG_NOT_SELF)))
        {

Insertion in crawl-ref/source/spl-cast.cc at line 1041 [7.293070]
[6.6476]
[6.6476]
```
        }
```

Replacement in crawl-ref/source/directn.h at line 154 [7.3696722]

B:BD[2.3544] → [2.3544:3595]

                targeting_behaviour *mod = NULL );

[2.3544]

[7.3697568]

                targeting_behaviour *mod = NULL, bool cancel_at_self = false );

Replacement in crawl-ref/source/directn.cc at line 475 [7.3697945]

B:BD[2.3674] → [2.3674:3715]

               targeting_behaviour *beh)

[2.3674]

[7.3700647]

               targeting_behaviour *beh, bool cancel_at_self)

Replacement in crawl-ref/source/directn.cc at line 1052 [7.3697945]

B:BD[10.11098] → [3.3727:3935]

                && (Options.allow_self_target == CONFIRM_CANCEL
                    || (Options.allow_self_target == CONFIRM_PROMPT
                        && !yesno("Really target yourself?", false, 'n'))))

[10.11098]

[11.1411]

                && (cancel_at_self
                    || Options.allow_self_target == CONFIRM_CANCEL
                    || Options.allow_self_target == CONFIRM_PROMPT
                       && !yesno("Really target yourself?", false, 'n')))

Replacement in crawl-ref/source/directn.cc at line 1057 [7.3697945]

B:BD[11.1425] → [3.3936:4002]

                if (Options.allow_self_target == CONFIRM_CANCEL )

[11.1425]

[3.4002]

                if (cancel_at_self)
                    mpr("Sorry, you can't target yourself.");
                else if (Options.allow_self_target == CONFIRM_CANCEL)

Insertion in crawl-ref/source/directn.cc at line 1061 [7.3697945]
[3.4083]
[12.284]

Replacement in crawl-ref/source/beam.cc at line 714 [7.4128068]

B:BD[13.2987] → [13.2987:3043]

        mprf(MSGCH_DIAGNOSTICS, "%s", "Beam stopped.");

[13.2987]

[13.3043]

        mprf(MSGCH_DIAGNOSTICS, "%s", "Beam cancelled.");

Replacement in crawl-ref/source/beam.cc at line 3633 [7.4128068]

B:BD[4.4512] → [4.4512:4649]

            if (!beam.aimed_at_feet && !beam.dont_stop_player
                && !yesno("That beam is likely to hit yourself. Continue "

[4.4512]

[4.4649]

            if (!beam.aimed_at_feet && !beam.dont_stop_player)
            {
                if (yesno("That beam is likely to hit yourself. Continue "

Replacement in crawl-ref/source/beam.cc at line 3637 [7.4128068]

B:BD[4.4699] → [4.4699:4850]

            {
                beam.fr_count += 1;
                beam.fr_power += you.experience_level;
                beam.dont_stop_player = true;

[4.4699]

[4.4850]

                {
                    beam.fr_count += 1;
                    beam.fr_power += you.experience_level;
                    beam.dont_stop_player = true;
                }
                else
                {
                    beam.beam_cancelled = true;
                    return (BEAM_STOP);
                }