fiddlerwoaroof/crawl - Change EAAACIJUVSBDOB6S73O4NFSMRDLFLQTFO7SXWWALGMVDZTQTHQBQC

Applied Enne's fix to 1795522: "show_beam shouldn't work

when just looking…"

While I was at it, I also added another parameter needs_path that is set to false for spells that can be applied directly to a target (SPFLAG_GRID, SPFLAG_TARGET) such as Smiting, Conjure Flame or Freezing Cloud, so for these the initial beam path doesn't show, even if the option should be set to true. Note "initial beam path" - you can still toggle it to show the path anyway. For cases such as this we might enforce not drawing the path but there would have to be some kind of feedback, so the player doesn't go crazy trying to toggle the option. ;)

I'll probably do it later, once I've found a way to give the information. Or would that be too spoily, in any case?

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

Created by j-p-e-g on September 15, 2007

EAAACIJUVSBDOB6S73O4NFSMRDLFLQTFO7SXWWALGMVDZTQTHQBQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-util.h at line 101 [5.242902]
[3.7806]
[4.177]
```
                      bool needs_path = true,
```

Replacement in crawl-ref/source/spl-util.cc at line 681 [5.245665]

∅:D[3.8047] → [4.400:443]

B:BD[4.400] → [4.400:443]

                      const char *prompt )

[3.8047]

[5.264740]

                      bool needs_path, const char *prompt )

Replacement in crawl-ref/source/spl-util.cc at line 686 [5.245665]

B:BD[5.264942] → [4.444:500]

    direction( spelld, restrict, mode, false, prompt );

[5.264942]

[5.264983]

    direction( spelld, restrict, mode, false, needs_path, prompt );

Insertion in crawl-ref/source/spl-cast.cc at line 34 [5.293070]
[5.293784]
[5.293784]
```
#include "item_use.h"
```

Replacement in crawl-ref/source/spl-cast.cc at line 863 [5.293070]

∅:D[6.277] → [7.29:57]

∅:D[8.1950] → [7.29:57]

B:BD[4.6323] → [7.29:57]

        if (dir == DIR_DIR)

[8.1950]

[6.278]

        if (spell == SPELL_PORTALED_PROJECTILE)
        {
            const int idx = get_fire_item_index();
            if ( idx == ENDOFPACK )
            {
                mpr("No suitable missiles.");
                return (SPRET_ABORT);
            }
            mprf(MSGCH_PROMPT, "Where do you want to aim %s?",
                               you.inv[idx].name(DESC_NOCAP_YOUR).c_str());
        }
        else if (dir == DIR_DIR)

Replacement in crawl-ref/source/spl-cast.cc at line 876 [5.293070]

∅:D[6.347] → [7.109:118]

B:BD[7.109] → [7.109:118]

B:BD[7.118] → [3.8197:8261]

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

[6.347]

[4.6442]


        bool needs_path =
             !(testbits(flags, SPFLAG_GRID) || testbits(flags, SPFLAG_TARGET));
             
        if ( !spell_direction( spd, beam, dir, targ, needs_path, prompt ) )

Replacement in crawl-ref/source/spells1.cc at line 84 [5.616635]

B:BD[5.618358] → [6.991:1068]

            direction(beam, DIR_TARGET, TARG_ANY, false, "Blink to where?");

[5.618358]

[5.618452]

            direction(beam, DIR_TARGET, TARG_ANY, false, false, "Blink to where?");

Replacement in crawl-ref/source/spells1.cc at line 455 [5.616635]

B:BD[5.623830] → [9.916:969]

        direction( spelld, DIR_TARGET, TARG_ENEMY );

[5.623830]

[5.623883]

        direction( spelld, DIR_TARGET, TARG_ENEMY, false, false );

Replacement in crawl-ref/source/item_use.cc at line 1343 [5.2781507]

B:BD[10.3950] → [10.3950:4016]

    direction( target, DIR_NONE, TARG_ENEMY, false, NULL, &beh );

[10.3950]

[10.4016]

    direction( target, DIR_NONE, TARG_ENEMY, false, true, NULL, &beh );

Replacement in crawl-ref/source/effects.cc at line 1558 [5.3382105]

B:BD[5.3427440] → [5.3427440:3427491]

        direction( targ, DIR_TARGET, TARG_ENEMY );

[5.3427440]

[5.3427491]

        direction( targ, DIR_TARGET, TARG_ENEMY, false, false );

Replacement in crawl-ref/source/direct.h at line 45 [5.3696722]

B:BD[3.14292] → [10.5463:5541]

                const char *prompt = NULL, targeting_behaviour *mod = NULL );

[3.14292]

[5.3697568]

                bool needs_path = true, const char *prompt = NULL,
                targeting_behaviour *mod = NULL );

Replacement in crawl-ref/source/direct.cc at line 254 [5.3697945]

B:BD[10.5765] → [10.5765:5826]

               const char *prompt, targeting_behaviour *beh)

[10.5765]

[5.3700647]

               bool needs_path, const char *prompt,
               targeting_behaviour *beh)

Replacement in crawl-ref/source/direct.cc at line 275 [5.3697945]

B:BD[5.3700723] → [2.761:801]

    bool show_beam = Options.show_beam;

[5.3700723]

[11.2776]

    bool show_beam = Options.show_beam && !just_looking && needs_path;