fiddlerwoaroof/crawl - Change W424WG7JEQN344GQAXTTPLLNYVQJZQJ5X4MLA4ACEVJYV6ECR45AC

Spellcasting allies never picked up ranged ammo (because SPELL_NO_SPELL

was considered ranged.) Improved the logic somewhat. Fixes 2398859.

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

Created by haranp on December 12, 2008

W424WG7JEQN344GQAXTTPLLNYVQJZQJ5X4MLA4ACEVJYV6ECR45AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2792 [4.1396662]

B:BD[2.6299] → [2.6299:6380]

                || !mons_has_ranged_spell(mon) && !mons_has_ranged_attack(mon)))

[2.6299]

[2.6380]

                || (!mons_has_ranged_spell(mon, true)
                    && !mons_has_ranged_attack(mon))))

Replacement in crawl-ref/source/monstuff.cc at line 4171 [4.1396662]

B:BD[3.3501] → [3.3501:3572]

            if (mons_has_ranged_attack(m) || mons_has_ranged_spell(m))

[3.3501]

[3.3572]

            if (mons_has_ranged_attack(m) || mons_has_ranged_spell(m, true))

Replacement in crawl-ref/source/mon-util.h at line 707 [4.1682293]
∅:D[5.10225] → [6.30561:30612]
B:BD[4.1698054] → [6.30561:30612]
```
bool mons_has_ranged_spell( const monsters *mon );
```
[5.10225]
[6.30612]
```
bool mons_has_ranged_spell( const monsters *mon, bool attack_only = false );
```
Replacement in crawl-ref/source/mon-util.cc at line 2916 [4.1699344]
B:BD[4.1747602] → [7.3842:3894]
```
static bool _ms_ranged_spell( spell_type monspell )
```
[4.1747602]
[4.1747646]
```
static bool _ms_ranged_spell( spell_type monspell, bool attack_only )
```
Insertion in crawl-ref/source/mon-util.cc at line 2920 [4.1699344]
[4.1747676]
[6.32995]
```
    case SPELL_NO_SPELL:
```

Insertion in crawl-ref/source/mon-util.cc at line 2928 [4.1699344]

[4.1747797]


    // These spells are ranged, but aren't direct attack spells.
    case SPELL_ANIMATE_DEAD:
    case SPELL_ANIMATE_SKELETON:
    case SPELL_SUMMON_DEMON:
    case SPELL_SUMMON_GREATER_DEMON:
    case SPELL_SUMMON_UNDEAD:
    case SPELL_SUMMON_UFETUBUS:
    case SPELL_SUMMON_HORRIBLE_THINGS:
    case SPELL_SUMMON_DRAKES:
    case SPELL_SUMMON_MUSHROOMS:
    case SPELL_SUMMON_ICE_BEAST:
        return (!attack_only);

Replacement in crawl-ref/source/mon-util.cc at line 2983 [4.1699344]
∅:D[5.10941] → [6.33181:33231]
B:BD[8.475] → [6.33181:33231]
```
bool mons_has_ranged_spell( const monsters *mon )
```
[5.10941]
[4.1747906]
```
bool mons_has_ranged_spell( const monsters *mon, bool attack_only )
```

Replacement in crawl-ref/source/mon-util.cc at line 2994 [4.1699344]

B:BD[4.1748441] → [7.3895:3947]

            if (_ms_ranged_spell( mon->spells[i] ))

[9.484171]

[4.1748492]

            if (_ms_ranged_spell( mon->spells[i], attack_only ))

Replacement in crawl-ref/source/mon-util.cc at line 4487 [4.1699344]

B:BD[10.5080] → [10.5080:5125]

            if (mons_has_ranged_spell(this))

[10.5080]

[10.5125]

            if (mons_has_ranged_spell(this, true))

Replacement in crawl-ref/source/misc.cc at line 2554 [4.1933596]

B:BD[11.1687] → [12.1628:1690]

bool mons_is_safe(const struct monsters *mon, bool want_move)

[13.20387]

[12.1690]

bool mons_is_safe(const monsters *mon, bool want_move)

Replacement in crawl-ref/source/effects.cc at line 3330 [4.3382105]

B:BD[14.3504] → [15.4934:4995]

    const bool ranged_attack = (mons_has_ranged_spell( mon )

[14.3504]

[15.4995]

    const bool ranged_attack = (mons_has_ranged_spell( mon, true )