fiddlerwoaroof/crawl - Change 4I62MHXSS7OWDF2QU7AYXCRB2ZAGHNCZQN24MENLXJFRSGMXXFLAC

Make all spectral things levitate again, instead of flying if their base

monsters flew, since levitation provides immunity from falling into e.g. deep water due to being immobilized. Also, when enslaving a monster's soul, free the monster first if it's trapped in a net.

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

Created by dolorous on January 7, 2009

4I62MHXSS7OWDF2QU7AYXCRB2ZAGHNCZQN24MENLXJFRSGMXXFLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 5560 [4.804403]

[3.5177]

    // If the monster's held in a net, get it out.
    mons_clear_trapping_net(mon);

Replacement in crawl-ref/source/mon-util.cc at line 1459 [4.1699344]
B:BD[4.1716477] → [5.4802:4846]
B:BD[5.4846] → [6.12922:12950]
∅:D[6.12950] → [5.4899:4905]
B:BD[5.4899] → [5.4899:4905]
```
    if (mon->type == MONS_PANDEMONIUM_DEMON
        && mon->ghost->fly)
    {
```
[4.1716477]
[6.12951]
```
    if (mon->type == MONS_PANDEMONIUM_DEMON && mon->ghost->fly)
```
Deletion in crawl-ref/source/mon-util.cc at line 1461 [4.1699344]
∅:D[7.2316] → [5.4925:4931]
∅:D[6.12985] → [5.4925:4931]
B:BD[5.4925] → [5.4925:4931]
```
    }
```

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

B:BD[2.2575] → [2.2575:2690]

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

[2.2575]

[8.1476]

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

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

B:BD[8.1477] → [2.2691:3057]

    // 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);

[8.1477]

[2.3057]

    flight_type ret = mons_class_flies(montype);