fiddlerwoaroof/crawl - Change Z3LQZFYAPLLSUPPZGUDIYQP7G5SQKFTMBYQYNBJRH4F5BUZGTXFQC

Fix 1945337: Vampires getting carnivorous/herbivorous mutations.

Fix 1944345: Dropping worn/wielded items while Berserk. Fix 1945347: Drinking from fountans while Berserk.

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

Created by j-p-e-g on April 18, 2008

Z3LQZFYAPLLSUPPZGUDIYQP7G5SQKFTMBYQYNBJRH4F5BUZGTXFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mutation.cc at line 1879 [3.1263003]

B:BD[2.21547] → [2.21547:21656]

    if ((mutat == MUT_SLOW_METABOLISM || mutat == MUT_FAST_METABOLISM)
        && you.species == SP_VAMPIRE)

[2.21547]

[2.21656]

    if (you.species == SP_VAMPIRE
        && (mutat == MUT_SLOW_METABOLISM || mutat == MUT_FAST_METABOLISM
            || mutat == MUT_CARNIVOROUS || mutat == MUT_HERBIVOROUS))

Replacement in crawl-ref/source/items.cc at line 1890 [3.2584728]
B:BD[3.2624515] → [4.581:605]
```
        unwield_item();
```
[3.2624515]
[3.2624586]
```
        if (!unwield_item())
            return (false);
```

Insertion in crawl-ref/source/item_use.cc at line 1134 [3.2781507]

[3.2805187]

        return false;
    }
    if (you.duration[DUR_BERSERKER])
    {
        canned_msg(MSG_TOO_BERSERK);

Insertion in crawl-ref/source/item_use.cc at line 3539 [3.2781507]

[5.399]

[6.1042]

        return false;
    }
    if (you.duration[DUR_BERSERKER])
    {
        canned_msg(MSG_TOO_BERSERK);

Insertion in crawl-ref/source/it_use2.cc at line 387 [3.2904329]

[4.1398]

[7.4065]

        return (false);
    if (you.duration[DUR_BERSERKER])
    {
        canned_msg(MSG_TOO_BERSERK);

Insertion in crawl-ref/source/it_use2.cc at line 393 [3.2904329]
[7.4089]
[2.30400]
```
    }
```
Replacement in crawl-ref/source/it_use2.cc at line 400 [3.2904329]
B:BD[3.2912233] → [3.2912233:2912262]
```
    you.wield_change = true;
```
[3.2912233]
[8.7750]
```
    you.wield_change  = true;
```

Replacement in crawl-ref/source/invent.cc at line 631 [3.2920632]

∅:D[9.2865] → [10.778856:778939]

B:BD[10.778856] → [10.778856:778939]

            && type == MT_DROP
            && (key == CONTROL('D') || key == '@'))

[9.2865]

[3.2922573]

        && type == MT_DROP
        && (key == CONTROL('D') || key == '@'))

Insertion in crawl-ref/source/invent.cc at line 957 [3.2920632]
[11.1616]
[12.386144]

Fix 1945337: Vampires getting carnivorous/herbivorous mutations.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mutation.cc at line 1879 [3.1263003]

Replacement in crawl-ref/source/items.cc at line 1890 [3.2584728]

Insertion in crawl-ref/source/item_use.cc at line 1134 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3539 [3.2781507]

Insertion in crawl-ref/source/it_use2.cc at line 387 [3.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 393 [3.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 400 [3.2904329]

Replacement in crawl-ref/source/invent.cc at line 631 [3.2920632]

Insertion in crawl-ref/source/invent.cc at line 957 [3.2920632]