fiddlerwoaroof/crawl - Change RM2JXW3ATVYRYHF3NMG5ALGI64OJ7IP2F3MDUDPUT5TBKSSN4KVQC

[1821098] Fixed bat transform not conferring flight. Fixed player_is_levitating and renamed it to player_is_airborne to describe the function better.

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

Created by dshaligram on October 27, 2007

RM2JXW3ATVYRYHF3NMG5ALGI64OJ7IP2F3MDUDPUT5TBKSSN4KVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 113 [4.5308]

B:BD[4.7937] → [5.155:201]

    bool mon_flies = mons->flies() == FL_FLY;

[4.7937]

[5.201]

    bool mon_flies = mons->flight_mode() == FL_FLY;

Replacement in crawl-ref/source/traps.cc at line 152 [4.5308]

B:BD[5.405] → [5.405:477]

    if (you.flies() == FL_FLY && (!you.confused() || one_chance_in(3)))

[5.405]

[4.8869]

    if (you.flight_mode() == FL_FLY && (!you.confused() || one_chance_in(3)))

Replacement in crawl-ref/source/traps.cc at line 166 [4.5308]
B:BD[4.9199] → [5.478:513]
```
        if (you.flies() == FL_FLY)
```
[4.9199]
[4.9224]
```
        if (you.flight_mode() == FL_FLY)
```

Replacement in crawl-ref/source/traps.cc at line 169 [4.5308]

B:BD[4.9277] → [4.9277:9363]

            fall_into_a_pool(you.x_pos, you.y_pos, false, grd[you.x_pos][you.y_pos]);

[4.9277]

[4.9363]

            fall_into_a_pool(you.x_pos, you.y_pos, false, grd(you.pos()));

Replacement in crawl-ref/source/terrain.cc at line 428 [4.26938]
B:BD[4.38362] → [4.38362:38392]
```
            if (!you.flies())
```
[4.38362]
[4.38392]
```
            if (!you.airborne())
```
Replacement in crawl-ref/source/spells4.cc at line 1284 [6.436250]
B:BD[6.471285] → [7.1049:1087]
```
        if ( player_is_levitating() )
```
[6.471285]
[7.1087]
```
        if ( player_is_airborne() )
```

Replacement in crawl-ref/source/spells1.cc at line 1052 [6.616635]

B:BD[6.639683] → [8.154:210]

    const bool was_levitating = player_is_levitating();

[6.639683]

[6.639805]

    const bool was_levitating = player_is_airborne();

Replacement in crawl-ref/source/religion.cc at line 980 [6.804403]
B:BD[9.540] → [10.216:256]
```
        if (you.flies() == FL_LEVITATE)
```
[9.540]
[9.685]
```
        if (you.flight_mode() == FL_LEVITATE)
```

Replacement in crawl-ref/source/religion.cc at line 1782 [6.804403]

B:BD[11.491] → [11.491:555]

        !player_is_levitating() && you.species != SP_MERFOLK &&

[11.491]

[11.555]

        !player_is_airborne() && you.species != SP_MERFOLK &&

Replacement in crawl-ref/source/player.h at line 62 [6.945993]
∅:D[12.1925] → [6.947270:947303]
B:BD[6.947270] → [6.947270:947303]
```
bool player_is_levitating(void);
```
[6.947270]
[6.947303]
```
bool player_is_airborne(void);
```
Replacement in crawl-ref/source/player.cc at line 176 [6.962854]
B:BD[13.339189] → [13.339189:339222]
```
    if (!player_is_levitating())
```
[13.339189]
[13.339222]
```
    if (!player_is_airborne())
```
Replacement in crawl-ref/source/player.cc at line 289 [6.962854]
B:BD[13.342682] → [13.342682:342722]
```
            if (!player_is_levitating()
```
[13.342682]
[13.342722]
```
            if (!player_is_airborne()
```
Replacement in crawl-ref/source/player.cc at line 322 [6.962854]
B:BD[14.305] → [14.305:341]
```
    return (!player_is_levitating()
```
[14.305]
[14.341]
```
    return (!player_is_airborne()
```

Replacement in crawl-ref/source/player.cc at line 1574 [6.962854]

B:BD[6.987866] → [8.690:741]

            mv -= (you.flies() == FL_FLY ? 4 : 2);

[6.987866]

[6.987918]

            mv -= (you.flight_mode() == FL_FLY ? 4 : 2);

Replacement in crawl-ref/source/player.cc at line 2072 [6.962854]
B:BD[15.723] → [8.742:777]
```
        if (you.flies() == FL_FLY)
```
[15.723]
[15.757]
```
        if (you.flight_mode() == FL_FLY)
```

Replacement in crawl-ref/source/player.cc at line 2432 [6.962854]

B:BD[6.1003990] → [16.164:241]

    int cap = 3500+(you.strength * 100)+(player_is_levitating() ? 1000 : 0);

[6.1003990]

[16.241]

    int cap = 3500+(you.strength * 100)+(player_is_airborne() ? 1000 : 0);

Replacement in crawl-ref/source/player.cc at line 3274 [6.962854]
B:BD[6.1028896] → [6.1028896:1028928]
```
    if (player_is_levitating())
```
[6.1028896]
[6.1028928]
```
    if (player_is_airborne())
```
Replacement in crawl-ref/source/player.cc at line 3479 [6.962854]
B:BD[6.1034029] → [6.1034029:1034061]
```
    if (player_is_levitating())
```
[6.1034029]
[6.1034061]
```
    if (player_is_airborne())
```
Replacement in crawl-ref/source/player.cc at line 3543 [6.962854]
B:BD[13.349276] → [13.349276:349324]
```
    const bool lev    = player_is_levitating();
```
[13.349276]
[13.349324]
```
    const bool lev    = player_is_airborne();
```
Replacement in crawl-ref/source/player.cc at line 3828 [6.962854]
B:BD[6.1043822] → [6.1043822:1043854]
```
bool player_is_levitating(void)
```
[6.1043822]
[6.1043854]
```
bool player_is_airborne(void)
```
Replacement in crawl-ref/source/player.cc at line 3830 [6.962854]
B:BD[6.1043856] → [12.2486:2518]
```
    return you.is_levitating();
```
[6.1043856]
[6.1043938]
```
    return you.airborne();
```

Replacement in crawl-ref/source/player.cc at line 5080 [6.962854]

B:BD[17.1877] → [18.3078:3147]

    return (is_levitating() || (flies() == FL_FLY && !paralysed()));

[17.1877]

[19.200948]

    return (is_levitating() || (flight_mode() == FL_FLY && !paralysed()));

Replacement in crawl-ref/source/player.cc at line 5889 [6.962854]
∅:D[3.274] → [8.1279:1313]
∅:D[18.4479] → [8.1279:1313]
B:BD[17.4950] → [8.1279:1313]
```
flight_type player::flies() const
```
[3.274]
[17.4981]
```
flight_type player::flight_mode() const
```

Replacement in crawl-ref/source/player.cc at line 5907 [6.962854]

B:BD[20.1132] → [20.1132:1209]

    return (species == SP_KENKU && flies() == FL_FLY && travelling_light());

[20.1132]

[8.1511]

    return (species == SP_KENKU
            && flight_mode() == FL_FLY && travelling_light());

Replacement in crawl-ref/source/output.cc at line 477 [6.1088282]
B:BD[6.1098006] → [6.1098006:1098042]
```
        if (player_is_levitating())
```
[6.1098006]
[6.1098042]
```
        if (player_is_airborne())
```
Replacement in crawl-ref/source/output.cc at line 952 [6.1088282]
B:BD[21.8496] → [21.8496:8542]
```
    const int rlevi = player_is_levitating();
```
[21.8496]
[21.8542]
```
    const int rlevi = player_is_airborne();
```
Replacement in crawl-ref/source/output.cc at line 1203 [6.1088282]
B:BD[22.59927] → [22.59927:59973]
```
    const int rlevi = player_is_levitating();
```
[22.59927]
[22.59973]
```
    const int rlevi = player_is_airborne();
```
Replacement in crawl-ref/source/output.cc at line 1380 [6.1088282]
B:BD[23.4921] → [23.4921:4953]
```
    if (player_is_levitating())
```
[23.4921]
[23.4953]
```
    if (player_is_airborne())
```
Replacement in crawl-ref/source/mon-util.cc at line 3544 [6.1699344]
B:BD[17.14630] → [8.2498:2534]
```
flight_type monsters::flies() const
```
[17.14630]
[17.14663]
```
flight_type monsters::flight_mode() const
```

Replacement in crawl-ref/source/misc.cc at line 447 [6.1933596]

B:BD[24.1028] → [24.1028:1159]

            mprf("You %s downwards.", you.flies()? "fly" :
                                     (player_is_levitating()? "float" :

[24.1028]

[24.1159]

            mprf("You %s downwards.", you.flight_mode() == FL_FLY? "fly" :
                                     (player_is_airborne()? "float" :

Replacement in crawl-ref/source/misc.cc at line 454 [6.1933596]

B:BD[24.1225] → [24.1225:1355]

        mprf("You %s %swards.", you.flies()? "fly" :
                                (player_is_levitating()? "float" : "climb"),

[24.1225]

[24.1355]

        mprf("You %s %swards.", you.flight_mode() == FL_FLY? "fly" :
                                (player_is_airborne()? "float" : "climb"),

Replacement in crawl-ref/source/misc.cc at line 574 [6.1933596]
B:BD[6.1944431] → [6.1944431:1944463]
```
    if (!player_is_levitating()
```
[6.1944431]
[25.10437]
```
    if (!player_is_airborne()
```
Replacement in crawl-ref/source/misc.cc at line 678 [6.1933596]
B:BD[6.1947541] → [6.1947541:1947573]
```
    if (player_is_levitating())
```
[6.1947541]
[6.1947573]
```
    if (player_is_airborne())
```

Replacement in crawl-ref/source/misc.cc at line 835 [6.1933596]

B:BD[6.1949692] → [26.420:472]

    if (!force_stair && you.flies() == FL_LEVITATE)

[6.1949692]

[6.1949766]

    if (!force_stair && you.flight_mode() == FL_LEVITATE)

Replacement in crawl-ref/source/misc.cc at line 852 [6.1933596]

B:BD[18.18020] → [2.469:525]

        if (you.flies() == FL_LEVITATE && !force_stair)

[18.18020]

[18.18089]

        if (you.flight_mode() == FL_LEVITATE && !force_stair)

Replacement in crawl-ref/source/misc.cc at line 876 [6.1933596]

B:BD[18.18790] → [18.18790:18840]

        if (you.flies() != FL_FLY || force_stair)

[18.18790]

[18.18840]

        if (you.flight_mode() != FL_FLY || force_stair)

Replacement in crawl-ref/source/misc.cc at line 1036 [6.1933596]
∅:D[27.1321] → [6.1956102:1956134]
B:BD[6.1956102] → [6.1956102:1956134]
```
    if (!player_is_levitating()
```
[27.1321]
[25.10473]
```
    if (!player_is_airborne()
```

Replacement in crawl-ref/source/misc.cc at line 1094 [6.1933596]

B:BD[18.19958] → [18.19958:20013]

            if (you.flies() == FL_FLY && !force_stair)

[18.19958]

[18.20013]

            if (you.flight_mode() == FL_FLY && !force_stair)

Replacement in crawl-ref/source/items.cc at line 1131 [6.2584728]
B:BD[19.351306] → [26.523:559]
```
    if (you.flies() == FL_LEVITATE)
```
[19.351306]
[19.351380]
```
    if (you.flight_mode() == FL_LEVITATE)
```
Replacement in crawl-ref/source/items.cc at line 1173 [6.2584728]
B:BD[6.2608027] → [26.560:596]
```
    if (you.flies() == FL_LEVITATE)
```
[6.2608027]
[6.2608101]
```
    if (you.flight_mode() == FL_LEVITATE)
```
Replacement in crawl-ref/source/items.cc at line 2954 [6.2584728]
B:BD[6.2657679] → [26.597:633]
```
    if (you.flies() == FL_LEVITATE)
```
[6.2657679]
[28.7712]
```
    if (you.flight_mode() == FL_LEVITATE)
```
Replacement in crawl-ref/source/item_use.cc at line 3171 [6.2781507]
B:BD[29.282] → [30.259:295]
```
    if (you.flies() == FL_LEVITATE)
```
[29.282]
[29.336]
```
    if (you.flight_mode() == FL_LEVITATE)
```

Replacement in crawl-ref/source/it_use2.cc at line 140 [6.2904329]

B:BD[31.18326] → [32.494:553]

             (!player_is_levitating()) ? "very" : "more");

[31.18326]

[6.2907511]

             (!player_is_airborne()) ? "very" : "more");

Replacement in crawl-ref/source/it_use2.cc at line 142 [6.2904329]
B:BD[6.2907512] → [6.2907512:2907549]
```
        if (!player_is_levitating())
```
[6.2907512]
[6.2907549]
```
        if (!player_is_airborne())
```
Replacement in crawl-ref/source/food.cc at line 229 [6.3043806]
B:BD[6.3052527] → [26.657:693]
```
    if (you.flies() == FL_LEVITATE)
```
[6.3052527]
[6.3052623]
```
    if (you.flight_mode() == FL_LEVITATE)
```
Replacement in crawl-ref/source/food.cc at line 732 [6.3043806]
B:BD[6.3062716] → [26.694:730]
```
    if (you.flies() == FL_LEVITATE)
```
[6.3062716]
[6.3062827]
```
    if (you.flight_mode() == FL_LEVITATE)
```
Replacement in crawl-ref/source/fight.cc at line 1817 [6.3140790]
B:BD[12.58110] → [8.3393:3424]
```
        if (defender->flies())
```
[12.58110]
[12.58139]
```
        if (defender->airborne())
```
Replacement in crawl-ref/source/fight.cc at line 3231 [6.3140790]
B:BD[33.442] → [8.3425:3456]
```
        if (defender->flies())
```
[33.442]
[17.74035]
```
        if (defender->airborne())
```
Replacement in crawl-ref/source/externs.h at line 168 [6.3270163]
B:BD[17.85829] → [8.3458:3501]
```
    virtual flight_type flies() const = 0;
```
[17.85829]
[18.21982]
```
    virtual flight_type flight_mode() const = 0;
```
Replacement in crawl-ref/source/externs.h at line 821 [6.3270163]
B:BD[17.87432] → [8.3627:3658]
```
    flight_type flies() const;
```
[17.87432]
[17.87460]
```
    flight_type flight_mode() const;
```
Replacement in crawl-ref/source/externs.h at line 1106 [6.3270163]
B:BD[17.88935] → [8.3659:3690]
```
    flight_type flies() const;
```
[17.88935]
[18.22415]
```
    flight_type flight_mode() const;
```

Replacement in crawl-ref/source/clua.cc at line 738 [19.483969]

∅:D[3.7369] → [26.799:912]

B:BD[19.499955] → [26.799:912]

LUARET1(you_levitating, boolean, you.flies() == FL_LEVITATE)
LUARET1(you_flying, boolean, you.flies() == FL_FLY)

[3.7369]

[19.500165]

LUARET1(you_levitating, boolean, you.flight_mode() == FL_LEVITATE)
LUARET1(you_flying, boolean, you.flight_mode() == FL_FLY)

Replacement in crawl-ref/source/acr.cc at line 1526 [6.4397395]
B:BD[2.902] → [2.902:947]
```
    if (shaft && you.flies() == FL_LEVITATE)
```
[2.902]
[18.24842]
```
    if (shaft && you.flight_mode() == FL_LEVITATE)
```

Replacement in crawl-ref/source/acr.cc at line 3313 [6.4397395]

B:BD[6.4466125] → [6.4466125:4466203]

            mpr( player_is_levitating() ? "You reach down and open the door."

[6.4466125]

[6.4466203]

            mpr( player_is_airborne() ? "You reach down and open the door."

Replacement in crawl-ref/source/acr.cc at line 3396 [6.4397395]

B:BD[6.4467997] → [6.4467997:4468076]

            mpr( player_is_levitating() ? "You reach down and close the door."

[6.4467997]

[6.4468076]

            mpr( player_is_airborne() ? "You reach down and close the door."

Replacement in crawl-ref/source/abl-show.cc at line 1978 [6.4494389]

B:BD[6.4537942] → [6.4537942:4538015]

    if (!you.duration[DUR_CONTROLLED_FLIGHT] && !player_is_levitating())

[34.27406]

[6.4538015]

    if (!you.duration[DUR_CONTROLLED_FLIGHT] && !player_is_airborne())

[1821098] Fixed bat transform not conferring flight. Fixed player_is_levitating and renamed it to player_is_airborne to describe the function better.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/traps.cc at line 113 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 152 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 166 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 169 [4.5308]

Replacement in crawl-ref/source/terrain.cc at line 428 [4.26938]

Replacement in crawl-ref/source/spells4.cc at line 1284 [6.436250]

Replacement in crawl-ref/source/spells1.cc at line 1052 [6.616635]

Replacement in crawl-ref/source/religion.cc at line 980 [6.804403]

Replacement in crawl-ref/source/religion.cc at line 1782 [6.804403]

Replacement in crawl-ref/source/player.h at line 62 [6.945993]

Replacement in crawl-ref/source/player.cc at line 176 [6.962854]

Replacement in crawl-ref/source/player.cc at line 289 [6.962854]

Replacement in crawl-ref/source/player.cc at line 322 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1574 [6.962854]

Replacement in crawl-ref/source/player.cc at line 2072 [6.962854]

Replacement in crawl-ref/source/player.cc at line 2432 [6.962854]

Replacement in crawl-ref/source/player.cc at line 3274 [6.962854]

Replacement in crawl-ref/source/player.cc at line 3479 [6.962854]

Replacement in crawl-ref/source/player.cc at line 3543 [6.962854]

Replacement in crawl-ref/source/player.cc at line 3828 [6.962854]

Replacement in crawl-ref/source/player.cc at line 3830 [6.962854]

Replacement in crawl-ref/source/player.cc at line 5080 [6.962854]

Replacement in crawl-ref/source/player.cc at line 5889 [6.962854]

Replacement in crawl-ref/source/player.cc at line 5907 [6.962854]

Replacement in crawl-ref/source/output.cc at line 477 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 952 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1203 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1380 [6.1088282]

Replacement in crawl-ref/source/mon-util.cc at line 3544 [6.1699344]

Replacement in crawl-ref/source/misc.cc at line 447 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 454 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 574 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 678 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 835 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 852 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 876 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 1036 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 1094 [6.1933596]

Replacement in crawl-ref/source/items.cc at line 1131 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1173 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 2954 [6.2584728]

Replacement in crawl-ref/source/item_use.cc at line 3171 [6.2781507]

Replacement in crawl-ref/source/it_use2.cc at line 140 [6.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 142 [6.2904329]

Replacement in crawl-ref/source/food.cc at line 229 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 732 [6.3043806]

Replacement in crawl-ref/source/fight.cc at line 1817 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 3231 [6.3140790]

Replacement in crawl-ref/source/externs.h at line 168 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 821 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 1106 [6.3270163]

Replacement in crawl-ref/source/clua.cc at line 738 [19.483969]

Replacement in crawl-ref/source/acr.cc at line 1526 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 3313 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 3396 [6.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 1978 [6.4494389]