fiddlerwoaroof/crawl - Change TDE7UVSZX4XJDAQWKCAPZ5IU25C75KKYUHXFI53JRIWHKK5SAGHQC

[1854279] Fixed scroll of fear not iding when resisted.

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

Created by dshaligram on December 28, 2007

TDE7UVSZX4XJDAQWKCAPZ5IU25C75KKYUHXFI53JRIWHKK5SAGHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 3959 [3.2781507]

B:BD[3.2861387] → [3.2861387:2861479]

        if (!mass_enchantment(ENCH_FEAR, 1000, MHITYOU))
            id_the_scroll = false;

[3.2861387]

[3.2861479]

    {
        int fear_influenced = 0;
        mass_enchantment(ENCH_FEAR, 1000, MHITYOU, NULL, &fear_influenced);
        id_the_scroll = fear_influenced;

Insertion in crawl-ref/source/item_use.cc at line 3964 [3.2781507]
[3.2861494]
[3.2861494]
```
    }
```

Replacement in crawl-ref/source/beam.h at line 208 [3.4124541]

B:BD[3.4126410] → [2.318:386]

bool mass_enchantment( enchant_type wh_enchant, int pow, int who );

[3.4126410]

[3.4126469]

bool mass_enchantment( enchant_type wh_enchant, int pow, int who,
                       int *m_succumbed = NULL, int *m_attempted = NULL );

Replacement in crawl-ref/source/beam.cc at line 1891 [3.4128068]

B:BD[3.4186947] → [2.1615:1685]

bool mass_enchantment( enchant_type wh_enchant, int pow, int origin )

[3.4186947]

[3.4187008]

// If m_succumbed is non-NULL, will be set to the number of monsters that
// were enchanted. If m_attempted is non-NULL, will be set to the number of
// monsters that we tried to enchant.
bool mass_enchantment( enchant_type wh_enchant, int pow, int origin,
                       int *m_succumbed, int *m_attempted )

Insertion in crawl-ref/source/beam.cc at line 1901 [3.4128068]

[3.4187127]

    if (m_succumbed)
        *m_succumbed = 0;
    if (m_attempted)
        *m_attempted = 0;

Insertion in crawl-ref/source/beam.cc at line 1923 [3.4128068]

[3.4188226]

[2.1730]

        if (m_attempted)
            ++*m_attempted;

Insertion in crawl-ref/source/beam.cc at line 1931 [3.4128068]

[3.4188355]

            if (m_succumbed)
                ++*m_succumbed;