fiddlerwoaroof/crawl - Change NF5ISJJGD3UIZYQHYM6LC726BBBMZBCFQ2HWDDXWY2NQQKH6JN4AC

make player::has_claws() and player::has_usable_claws() take a bool

indicating whether claws from transformations should be taken into account; this removes the need for more special cases dealing with trolls' and ghouls' built-in claws

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

Created by dolorous on November 21, 2007

NF5ISJJGD3UIZYQHYM6LC726BBBMZBCFQ2HWDDXWY2NQQKH6JN4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 626 [4.143977]

B:BD[4.159636] → [4.159636:159700]

    if (use_which == EQ_GLOVES && you.mutation[MUT_CLAWS] >= 3)

[4.159636]

[4.159700]

    if (use_which == EQ_GLOVES && you.has_claws(false) >= 3)

Replacement in crawl-ref/source/player.cc at line 569 [4.962854]

B:BD[5.684] → [5.684:744]

       if (you.mutation[MUT_CLAWS] >= 3 && eq == EQ_GLOVES)

[5.684]

[5.744]

       if (eq == EQ_GLOVES && you.has_claws(false) >= 3)

Replacement in crawl-ref/source/player.cc at line 6118 [4.962854]
B:BD[6.1544] → [3.277:307]
```
int player::has_claws() const
```
[6.1544]
[5.992]
```
int player::has_claws(bool allow_tran) const
```

Replacement in crawl-ref/source/player.cc at line 6120 [4.962854]

B:BD[5.994] → [5.994:1166]

    // these transformations bring claws with them
    if (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
        || attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL)

[5.994]

[5.1166]

    if (allow_tran)

Replacement in crawl-ref/source/player.cc at line 6122 [4.962854]

B:BD[5.1172] → [3.308:332]

        return 3;
    }

[5.1172]

[3.332]

        // these transformations bring claws with them
        if (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
            || attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL)
        {
            return 3;
        }

Replacement in crawl-ref/source/player.cc at line 6129 [4.962854]

B:BD[3.333] → [3.333:582]

    // transformations other than these will override claws
    if (attribute[ATTR_TRANSFORMATION] != TRAN_NONE
        && attribute[ATTR_TRANSFORMATION] != TRAN_STATUE
        && attribute[ATTR_TRANSFORMATION] != TRAN_LICH)
    {
        return 0;

[3.333]

[5.1193]

        // transformations other than these will override claws
        if (attribute[ATTR_TRANSFORMATION] != TRAN_NONE
            && attribute[ATTR_TRANSFORMATION] != TRAN_STATUE
            && attribute[ATTR_TRANSFORMATION] != TRAN_LICH)
        {
            return 0;
        }

Replacement in crawl-ref/source/player.cc at line 6145 [4.962854]
∅:D[5.1594] → [6.1544:1582]
B:BD[6.1544] → [6.1544:1582]
```
bool player::has_usable_claws() const
```
[5.1594]
[6.1582]
```
bool player::has_usable_claws(bool allow_tran) const
```

Replacement in crawl-ref/source/player.cc at line 6147 [4.962854]

B:BD[6.1584] → [5.1595:1647]

    return (equip[EQ_GLOVES] == -1 && has_claws());

[6.1584]

[6.1793]

    return (equip[EQ_GLOVES] == -1 && has_claws(allow_tran));

Replacement in crawl-ref/source/itemprop.cc at line 1182 [7.646661]
B:BD[7.681264] → [7.681264:681310]
```
            if (you.mutation[MUT_CLAWS] >= 3)
```
[7.681264]
[7.681310]
```
            if (you.has_claws(false) >= 3)
```
Replacement in crawl-ref/source/item_use.cc at line 780 [4.2781507]
B:BD[5.2150] → [3.792:826]
```
        if (you.has_claws() >= 3)
```
[5.2150]
[5.2258]
```
        if (you.has_claws(false) >= 3)
```
Replacement in crawl-ref/source/externs.h at line 769 [4.3270163]
B:BD[8.83074] → [3.849:882]
∅:D[3.882] → [6.24982:25022]
∅:D[5.3503] → [6.24982:25022]
B:BD[8.83074] → [6.24982:25022]
```
    int       has_claws() const;
    bool      has_usable_claws() const;
```
[8.83074]
[8.83074]
```
    int       has_claws(bool allow_tran = true) const;
    bool      has_usable_claws(bool allow_tran = true) const;
```

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

B:BD[2.5273] → [2.5273:5347]

            || you.mutation[MUT_CLAWS] >= 3 && type_wanted == ARM_GLOVES)

[2.5273]

[4.3400595]

            || you.has_claws(false) >= 3 && type_wanted == ARM_GLOVES)

make player::has_claws() and player::has_usable_claws() take a bool

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.cc at line 626 [4.143977]

Replacement in crawl-ref/source/player.cc at line 569 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6118 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6120 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6122 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6129 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6145 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6147 [4.962854]

Replacement in crawl-ref/source/itemprop.cc at line 1182 [7.646661]

Replacement in crawl-ref/source/item_use.cc at line 780 [4.2781507]

Replacement in crawl-ref/source/externs.h at line 769 [4.3270163]

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