fiddlerwoaroof/crawl - Change LMRRQE4ZXQYZPXVGBTDZP7LEIM6OGSSOOQ5FAOWXJCDCNCECX5VAC

Only apply targeting via monster list to spells and such where

targeting monsters is actually needed.

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

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

LMRRQE4ZXQYZPXVGBTDZP7LEIM6OGSSOOQ5FAOWXJCDCNCECX5VAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 1149 [5.5308]
B:BD[4.2413] → [4.2413:2442]
```
    switch(place.level_type)
```
[4.2413]
[4.2442]
```
    switch (place.level_type)
```

Replacement in crawl-ref/source/spl-util.h at line 134 [8.242902]

B:BD[6.7806] → [7.141:187]

                      bool needs_path = true,

[6.7806]

[9.177]

                      bool needs_path = true, bool may_target_monster = true,

Replacement in crawl-ref/source/spl-util.cc at line 554 [8.245665]

B:BD[8.259053] → [8.259053:259118]

// apply func to one square of player's choice beside the player

[8.259053]

[8.259118]

// Apply func to one square of player's choice beside the player.

Replacement in crawl-ref/source/spl-util.cc at line 574 [8.245665]
B:BD[8.259574] → [8.259574:259645]
```
}                               // end apply_one_neighbouring_square()
```
[8.259574]
[8.259645]
```
}
```

Replacement in crawl-ref/source/spl-util.cc at line 795 [8.245665]

B:BD[6.8047] → [7.189:249]

                      bool needs_path, const char *prompt )

[6.8047]

[8.264740]

                      bool needs_path, bool may_target_monster,
                      const char *prompt )

Replacement in crawl-ref/source/spl-util.cc at line 801 [8.245665]

B:BD[8.264942] → [10.158:230]

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

[8.264942]

[8.264983]

    direction( spelld, restrict, mode, -1, false, needs_path,
               may_target_monster, prompt );

Replacement in crawl-ref/source/spl-cast.cc at line 1034 [8.293070]

B:BD[11.2907] → [12.278:350]

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

[11.2907]

[9.6442]

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

Replacement in crawl-ref/source/spells1.cc at line 106 [8.616635]

B:BD[8.618358] → [10.244:312]

            direction(beam, DIR_TARGET, TARG_ANY, -1, false, false,

[8.618358]

[13.228]

            direction(beam, DIR_TARGET, TARG_ANY, -1, false, false, false,

Replacement in crawl-ref/source/spells1.cc at line 502 [8.616635]

B:BD[8.623830] → [10.313:384]

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

[8.623830]

[8.623883]

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

Replacement in crawl-ref/source/spells1.cc at line 689 [8.616635]

B:BD[2.248] → [2.248:301]

                                      "Heal whom?");

[2.248]

[14.310]

                                      true, "Heal whom?");

Insertion in crawl-ref/source/item_use.cc at line 1459 [8.2781507]
[15.5715]
[16.33228]

Replacement in crawl-ref/source/item_use.cc at line 1462 [8.2781507]

∅:D[16.33312] → [17.3907:3988]

B:BD[17.3907] → [17.3907:3988]

    direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, NULL, &beh );

[16.33312]

[18.9036]

    direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, true,
               NULL, &beh );

Replacement in crawl-ref/source/directn.h at line 153 [8.3696722]

B:BD[10.3194] → [10.3194:3272]

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

[10.3194]

[8.3697568]

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

Replacement in crawl-ref/source/directn.cc at line 474 [8.3697945]

B:BD[10.4933] → [3.3622:3700]

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

[10.4933]

[8.3700647]

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

Replacement in crawl-ref/source/directn.cc at line 484 [8.3697945]

B:BD[19.6878] → [19.6878:6952]

    if (!just_looking && Options.mlist_targetting == MLIST_TARGET_HIDDEN)

[19.6878]

[19.6952]

    if (!just_looking && may_target_monster && restricts != DIR_DIR
        && Options.mlist_targetting == MLIST_TARGET_HIDDEN)

Replacement in crawl-ref/source/decks.cc at line 1681 [8.3987460]

B:BD[20.5432] → [20.5432:5504]

    if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY, true, info)

[20.5432]

[20.5504]

    if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY, true, true, info)

Replacement in crawl-ref/source/debug.cc at line 711 [8.4016436]

B:BD[21.9055] → [21.9055:9154]

    if ((down && real_dir == CMD_GO_UPSTAIRS)
        || (!down && real_dir == CMD_GO_DOWNSTAIRS))

[21.9055]

[21.9154]

    if (down && real_dir == CMD_GO_UPSTAIRS
        || !down && real_dir == CMD_GO_DOWNSTAIRS)
    {

Insertion in crawl-ref/source/debug.cc at line 715 [8.4016436]
[21.9176]
[8.4032496]
```
    }
```

Replacement in crawl-ref/source/debug.cc at line 4108 [8.4016436]

B:BD[22.3411] → [22.3411:3469]

    direction(moves, DIR_NONE, TARG_ANY, -1, true, false,

[22.3411]

[22.3469]

    direction(moves, DIR_NONE, TARG_ANY, -1, true, false, true,

Replacement in crawl-ref/source/acr.cc at line 3816 [8.4397395]
B:BD[8.4466766] → [8.4466766:4466795]
```
    if (!(door_x || door_y))
```
[8.4466766]
[8.4466795]
```
    if (!door_x && !door_y)
```