fiddlerwoaroof/crawl - Change 6TQASFI7B552ZNCBVI7AS3MMMACNTGEJESTB74EFCH2MJGH5LW3AC

Convert asphyxiation resistance to a boolean, since you can either be

asphyxiated or not.

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

Created by dolorous on September 20, 2009

6TQASFI7B552ZNCBVI7AS3MMMACNTGEJESTB74EFCH2MJGH5LW3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.h at line 248 [5.945993]
B:BD[4.336651] → [4.336651:336677]
```
bool player_res_asphyx();
```
[4.336651]
[5.952294]
```
int player_res_asphyx();
```

Deletion in crawl-ref/source/player.cc at line 1646 [5.962854]

B:BD[4.345830] → [4.345830:346106]

B:BD[4.346156] → [4.346156:346185]

B:BD[4.346185] → [6.2447:2448]

∅:D[6.2448] → [4.346185:346208]

B:BD[4.346185] → [4.346185:346208]

// Does the player resist asphyxiation?
bool player_res_asphyx()
{
    // The undead are immune to asphyxiation, or so we'll assume.
    if (you.is_undead)
        return (true);
    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_LICH:
    case TRAN_STATUE:
        return (true);
    }
    return (false);
}

Insertion in crawl-ref/source/player.cc at line 1717 [5.962854]

[7.2450]

int player_res_asphyx()
{
    int ra = 0;
    // The undead are immune to asphyxiation, or so we'll assume.
    if (you.is_undead)
        ra++;
    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_LICH:
    case TRAN_STATUE:
        ra++;
        break;
    }
    if (ra > 1)
        ra = 1;
    return (ra);
}

Replacement in crawl-ref/source/player.cc at line 5409 [5.962854]
B:BD[8.2736] → [8.2736:2766]
```
    if (!player_res_asphyx())
```
[8.2736]
[8.2766]
```
    if (player_res_asphyx() > 0)
```
Deletion in crawl-ref/source/mon-util.h at line 386 [5.1682293]
B:BD[9.10740] → [9.10740:10758]
```
    short asphyx;
```
Insertion in crawl-ref/source/mon-util.h at line 388 [5.1682293]
[9.10775]
[9.10775]
```
    bool asphyx;
```
Insertion in crawl-ref/source/mon-util.h at line 621 [5.1682293]
[10.3937]
[7.2799]
```
int mons_res_asphyx(const monsters *mon);
```
Deletion in crawl-ref/source/mon-util.h at line 627 [5.1682293]
B:BD[10.4070] → [10.4070:4113]
```
bool mons_res_asphyx(const monsters *mon);
```
Deletion in crawl-ref/source/mon-util.cc at line 1308 [5.1699344]
B:BD[5.1711021] → [11.6154:6156]
∅:D[11.6156] → [5.1711076:1711077]
B:BD[5.1711076] → [5.1711076:1711077]
B:BD[5.1711077] → [12.3426:3468]
∅:D[12.3468] → [4.472015:472017]
B:BD[4.472015] → [4.472015:472017]
B:BD[4.472017] → [12.3469:3524]
B:BD[13.4298] → [13.4298:4330]
B:BD[13.4330] → [14.3420:3546]
```
}
bool mons_res_asphyx(const monsters *mon)
{
    const mon_holy_type holiness = mons_holiness(mon);
    return (mons_is_unholy(mon)
            || holiness == MH_NONLIVING
            || holiness == MH_PLANT
            || get_mons_resists(mon).asphyx > 0);
```

Insertion in crawl-ref/source/mon-util.cc at line 1354 [5.1699344]

[9.12367]

[7.2849]

int mons_res_asphyx(const monsters *mon)
{
    int res = get_mons_resists(mon).asphyx;
    const mon_holy_type holiness = mons_holiness(mon);
    if (mons_is_unholy(mon)
        || holiness == MH_NONLIVING
        || holiness == MH_PLANT)
    {
        res += 1;
    }
    return (res);
}

Replacement in crawl-ref/source/mon-util.cc at line 3780 [5.1699344]
∅:D[15.2649] → [16.286:321]
∅:D[2.2837] → [16.286:321]
∅:D[17.8091] → [16.286:321]
B:BD[16.286] → [16.286:321]
```
    return (!mons_res_asphyx(this)
```
[2.2837]
[16.321]
```
    return (mons_res_asphyx(this) > 0
```

Replacement in crawl-ref/source/mon-util.cc at line 9279 [5.1699344]

B:BD[9.15184] → [9.15184:15251]

B:BD[9.15251] → [3.4010:4084]

∅:D[3.4084] → [9.15309:15337]

B:BD[9.15309] → [9.15309:15337]

    : elec(0), poison(0), fire(0), steam(0), cold(0), hellfire(0),
      asphyx(0), acid(0), sticky_flame(false), rotting(false), pierce(0),
      slice(0), bludgeon(0)

[9.15184]

[9.15337]

    : elec(0), poison(0), fire(0), steam(0), cold(0), hellfire(0), acid(0),
      asphyx(false), sticky_flame(false), rotting(false), pierce(0), slice(0),
      bludgeon(0)

Replacement in crawl-ref/source/mon-util.cc at line 9302 [5.1699344]

B:BD[9.15397] → [9.15397:15464]

B:BD[9.15464] → [3.4085:4159]

∅:D[3.4159] → [9.15522:15550]

B:BD[9.15522] → [9.15522:15550]

    : elec(0), poison(0), fire(0), steam(0), cold(0), hellfire(0),
      asphyx(0), acid(0), sticky_flame(false), rotting(false), pierce(0),
      slice(0), bludgeon(0)

[9.15397]

[9.15550]

    : elec(0), poison(0), fire(0), steam(0), cold(0), hellfire(0), acid(0),
      asphyx(false), sticky_flame(false), rotting(false), pierce(0), slice(0),
      bludgeon(0)

Replacement in crawl-ref/source/mon-util.cc at line 9312 [5.1699344]

B:BD[18.32919] → [18.32919:33127]

∅:D[18.33127] → [19.3366:3418]

B:BD[19.3366] → [19.3366:3418]

B:BD[19.3418] → [18.33128:33284]

        case MR_RES_STEAM:    steam    =  3; break;
        case MR_RES_ELEC:     elec     = nl; break;
        case MR_RES_POISON:   poison   = nl; break;
        case MR_RES_FIRE:     fire     = nl; break;
        case MR_RES_HELLFIRE: hellfire = nl; break;
        case MR_RES_COLD:     cold     = nl; break;
        case MR_RES_ASPHYX:   asphyx   = nl; break;
        case MR_RES_ACID:     acid     = nl; break;

[18.32919]

[20.12210]

        case MR_RES_STEAM:    steam      =    3; break;
        case MR_RES_ELEC:     elec       =   nl; break;
        case MR_RES_POISON:   poison     =   nl; break;
        case MR_RES_FIRE:     fire       =   nl; break;
        case MR_RES_HELLFIRE: hellfire   =   nl; break;
        case MR_RES_COLD:     cold       =   nl; break;
        case MR_RES_ASPHYX:   asphyx     = true; break;
        case MR_RES_ACID:     acid       =   nl; break;

Replacement in crawl-ref/source/mon-util.cc at line 9322 [5.1699344]

B:BD[18.33312] → [18.33312:33524]

        case MR_VUL_ELEC:     elec     = -nl; break;
        case MR_VUL_POISON:   poison   = -nl; break;
        case MR_VUL_FIRE:     fire     = -nl; break;
        case MR_VUL_COLD:     cold     = -nl; break;

[18.33312]

[20.12212]

        case MR_VUL_ELEC:     elec       = -nl;  break;
        case MR_VUL_POISON:   poison     = -nl;  break;
        case MR_VUL_FIRE:     fire       = -nl;  break;
        case MR_VUL_COLD:     cold       = -nl;  break;

Replacement in crawl-ref/source/mon-util.cc at line 9328 [5.1699344]

B:BD[18.33579] → [18.33579:33683]

∅:D[18.33683] → [19.3853:3905]

B:BD[19.3853] → [19.3853:3905]

        case MR_RES_PIERCE:   pierce   = nl; break;
        case MR_RES_SLICE:    slice    = nl; break;
        case MR_RES_BLUDGEON: bludgeon = nl; break;

[18.33579]

[20.12214]

        case MR_RES_PIERCE:   pierce     = nl;   break;
        case MR_RES_SLICE:    slice      = nl;   break;
        case MR_RES_BLUDGEON: bludgeon   = nl;   break;

Replacement in crawl-ref/source/mon-util.cc at line 9333 [5.1699344]

B:BD[18.33742] → [18.33742:33848]

∅:D[18.33848] → [19.4004:4057]

B:BD[19.4004] → [19.4004:4057]

        case MR_VUL_PIERCE:   pierce   = -nl; break;
        case MR_VUL_SLICE:    slice    = -nl; break;
        case MR_VUL_BLUDGEON: bludgeon = -nl; break;

[18.33742]

[9.16576]

        case MR_VUL_PIERCE:   pierce     = -nl;  break;
        case MR_VUL_SLICE:    slice      = -nl;  break;
        case MR_VUL_BLUDGEON: bludgeon   = -nl;  break;

Replacement in crawl-ref/source/mon-util.cc at line 9352 [5.1699344]
B:BD[18.33990] → [18.33990:34019]
```
    asphyx      += o.asphyx;
```
[18.33990]
[18.34019]
```
    asphyx       = asphyx       || o.asphyx;
```
Deletion in crawl-ref/source/externs.h at line 388 [5.3270163]
B:BD[21.85739] → [6.2790:2830]
```
    virtual int res_asphyx() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 389 [5.3270163]
[21.85779]
[8.4039]
```
    virtual int res_asphyx() const = 0;
```
Deletion in crawl-ref/source/externs.h at line 1115 [5.3270163]
B:BD[21.87366] → [6.2831:2859]
```
    int res_asphyx() const;
```
Insertion in crawl-ref/source/externs.h at line 1116 [5.3270163]
[21.87394]
[8.4086]
```
    int res_asphyx() const;
```
Insertion in crawl-ref/source/externs.h at line 1476 [5.3270163]
[21.88869]
[6.2860]
```
    int res_poison() const;
```
Deletion in crawl-ref/source/externs.h at line 1478 [5.3270163]
∅:D[6.2888] → [21.88869:88897]
B:BD[21.88869] → [21.88869:88897]
```
    int res_poison() const;
```

Convert asphyxiation resistance to a boolean, since you can either be

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.h at line 248 [5.945993]

Deletion in crawl-ref/source/player.cc at line 1646 [5.962854]

Insertion in crawl-ref/source/player.cc at line 1717 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5409 [5.962854]

Deletion in crawl-ref/source/mon-util.h at line 386 [5.1682293]

Insertion in crawl-ref/source/mon-util.h at line 388 [5.1682293]

Insertion in crawl-ref/source/mon-util.h at line 621 [5.1682293]

Deletion in crawl-ref/source/mon-util.h at line 627 [5.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 1308 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1354 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3780 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9279 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9302 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9312 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9322 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9328 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9333 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9352 [5.1699344]

Deletion in crawl-ref/source/externs.h at line 388 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 389 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 1115 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 1116 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 1476 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 1478 [5.3270163]