fiddlerwoaroof/crawl - Change 456KTRCLDMONHJFPEKJYMXO737ZHKN36ZU3UQ77JDERXBU5VFMVQC

Fix flight type handling so that spectral things can at least always

levitate again (since their class can), regardless of what actual type they are.

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

Created by dolorous on October 6, 2008

456KTRCLDMONHJFPEKJYMXO737ZHKN36ZU3UQ77JDERXBU5VFMVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6372 [4.962854]
B:BD[3.4595] → [3.4595:4618]
```
        return FL_FLY;
```
[3.4595]
[3.4618]
```
        return (FL_FLY);
```
Insertion in crawl-ref/source/mon-util.cc at line 1266 [4.1699344]
[4.1716208]
[5.1350]
```
    if (mons_class_flag(mc, M_LEVITATE))
        return (FL_LEVITATE);
```
Deletion in crawl-ref/source/mon-util.cc at line 1272 [4.1699344]
B:BD[4.1716371] → [5.1389:1430]
∅:D[5.1430] → [6.2190:2220]
B:BD[4.1716395] → [6.2190:2220]
∅:D[6.2220] → [4.1716415:1716416]
B:BD[4.1716415] → [4.1716415:1716416]
```
    if (mons_class_flag(mc, M_LEVITATE))
        return (FL_LEVITATE);
```

Insertion in crawl-ref/source/mon-util.cc at line 1282 [4.1699344]

[7.4931]

[5.1476]


    flight_type ret = FL_NONE;
    if (mons_is_zombified(mon))
        ret = mons_class_flies(mon->base_monster);

Replacement in crawl-ref/source/mon-util.cc at line 1288 [4.1699344]

B:BD[5.1477] → [2.4890:5021]

    const int montype = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                               : mon->type;

[5.1477]

[8.9685]

    // Set flight status this way so that monsters will always have the
    // best flight status possible.  This is necessary so that monsters
    // with FL_NONE status when alive get FL_LEVITATE status as spectral
    // things, and monsters with FL_FLY status when alive retain it as
    // spectral things.
    ret = std::max(mons_class_flies(mon->type), ret);
    if (ret == FL_NONE && _scan_mon_inv_randarts(mon, RAP_LEVITATE) > 0)
        ret = FL_LEVITATE;

Replacement in crawl-ref/source/mon-util.cc at line 1298 [4.1699344]

B:BD[8.9686] → [2.5022:5077]

∅:D[9.2677] → [6.2376:2398]

∅:D[2.5077] → [6.2376:2398]

B:BD[6.2376] → [6.2376:2398]

B:BD[6.2398] → [10.5460:5618]

    const flight_type ret = mons_class_flies(montype);
    return (ret ? ret
                : (_scan_mon_inv_randarts(mon, RAP_LEVITATE) > 0) ? FL_LEVITATE
                                                                  : FL_NONE);

[8.9686]

[11.3406]

    return (ret);

Replacement in crawl-ref/source/misc.cc at line 1355 [4.1933596]

B:BD[12.1028] → [13.1596:1671]

B:BD[13.1671] → [14.11426:11507]

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

[12.1028]

[12.1208]

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

Replacement in crawl-ref/source/misc.cc at line 1362 [4.1933596]

B:BD[12.1225] → [13.1742:1886]

∅:D[13.1886] → [12.1355:1412]

B:BD[12.1355] → [12.1355:1412]

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

[12.1225]

[12.1412]

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

Replacement in crawl-ref/source/misc.cc at line 1597 [4.1933596]

B:BD[4.1947541] → [15.1234:1351]

    if (you.flight_mode() == FL_FLY)
        mpr("You fly upwards.");
    else if (you.flight_mode() == FL_LEVITATE)

[4.1947541]

[15.1351]

    if (you.flight_mode() == FL_LEVITATE)

Insertion in crawl-ref/source/misc.cc at line 1599 [4.1933596]

[15.1424]

[4.1947761]

    else if (you.flight_mode() == FL_FLY)
        mpr("You fly upwards.");

Replacement in crawl-ref/source/ghost.cc at line 201 [7.9890]

∅:D[16.7356] → [17.20720:20811]

B:BD[17.20720] → [17.20720:20811]

    fly = (one_chance_in(3)? FL_NONE :
           one_chance_in(5)? FL_LEVITATE : FL_FLY);

[16.7356]

[18.4483]

    fly = (one_chance_in(3) ? FL_NONE :
           one_chance_in(5) ? FL_LEVITATE : FL_FLY);

Insertion in crawl-ref/source/enum.h at line 1413 [4.3287960]

[4.3326521]

[6.3692]

// This should be in order from the worst flight status to the best.
// See mons_flies().

Replacement in crawl-ref/source/enum.h at line 1418 [4.3287960]
B:BD[6.3728] → [6.3728:3756]
```
    FL_FLY,
    FL_LEVITATE
```
[6.3728]
[6.3756]
```
    FL_LEVITATE,
    FL_FLY
```

Replacement in crawl-ref/source/abl-show.cc at line 847 [4.4494389]

B:BD[19.16192] → [19.16192:16339]

            if (you.flight_mode() == FL_FLY)
                mpr("You're already flying!");
            else if (you.flight_mode() == FL_LEVITATE)

[19.16192]

[19.16339]

            if (you.flight_mode() == FL_LEVITATE)

Insertion in crawl-ref/source/abl-show.cc at line 849 [4.4494389]

[19.16406]

            else if (you.flight_mode() == FL_FLY)
                mpr("You're already flying!");