fiddlerwoaroof/crawl - Change RGM7NKVVYCZ653RAS5NFFI6ZJ46WL2CUOK2TY7ESRVXJX2ENQCMAC

[2881182] Fix being unable to place flying monsters over lava in maps (due).

Created by Darshan Shaligram on October 18, 2009

RGM7NKVVYCZ653RAS5NFFI6ZJ46WL2CUOK2TY7ESRVXJX2ENQCMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monplace.cc at line 692 [6.1641732]

∅:D[4.2833] → [5.7266:7323]

∅:D[2.2872] → [5.7266:7323]

B:BD[7.2581] → [5.7266:7323]

B:BD[5.7323] → [8.2973:3034]

static bool _valid_monster_location(const mgen_data &mg,
                                    const coord_def &mg_pos)

[2.2872]

[7.2700]

static bool _valid_monster_generation_location(
    const mgen_data &mg,
    const coord_def &mg_pos)

Replacement in crawl-ref/source/monplace.cc at line 696 [6.1641732]

B:BD[7.2702] → [9.2670:2810]

B:BD[9.2810] → [3.19450:19498]

∅:D[3.19498] → [10.3422:3481]

B:BD[10.3422] → [10.3422:3481]

B:BD[10.3481] → [3.19499:19550]

∅:D[3.19550] → [10.3532:3593]

B:BD[10.3532] → [10.3532:3593]

∅:D[9.2864] → [7.2928:2999]

∅:D[10.3593] → [7.2928:2999]

B:BD[7.2928] → [7.2928:2999]

B:BD[7.2999] → [11.6592:6618]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);
    const dungeon_feature_type feat_preferred =
        habitat2grid(mons_class_primary_habitat(montype));
    const dungeon_feature_type feat_nonpreferred =
        habitat2grid(mons_class_secondary_habitat(montype));
    if (!in_bounds(mg_pos))
        return (false);
    // Occupied?
    if (actor_at(mg_pos))

[7.2702]

[7.3059]

    if (!in_bounds(mg_pos) || actor_at(mg_pos))

Replacement in crawl-ref/source/monplace.cc at line 699 [6.1641732]

B:BD[7.3084] → [7.3084:3137]

B:BD[7.3137] → [3.19551:19719]

    // Is the monster happy where we want to put it?
    if (!feat_compatible(feat_preferred, grd(mg_pos))
        && (feat_nonpreferred == feat_preferred
            || !feat_compatible(feat_nonpreferred, grd(mg_pos))))

[7.3084]

[10.3796]

    const int montype = (mons_class_is_zombified(mg.cls) ? mg.base_type
                                                         : mg.cls);
    if (!monster_habitable_grid(montype, grd(mg_pos),
                                mons_class_flies(montype), false)
        || (mg.behaviour != BEH_FRIENDLY && is_sanctuary(mg_pos)))

Deletion in crawl-ref/source/monplace.cc at line 707 [6.1641732]
∅:D[10.3809] → [7.3219:3220]
B:BD[7.3219] → [7.3219:3220]
B:BD[7.3220] → [12.34944:35006]
∅:D[12.35006] → [7.3294:3318]
B:BD[7.3294] → [7.3294:3318]
```
    if (mg.behaviour != BEH_FRIENDLY && is_sanctuary(mg_pos))
        return (false);
```
Replacement in crawl-ref/source/monplace.cc at line 717 [6.1641732]
B:BD[7.3600] → [8.3157:3208]
```
static bool _valid_monster_location(mgen_data &mg)
```
[7.3600]
[7.3651]
```
static bool _valid_monster_generation_location(mgen_data &mg)
```

Replacement in crawl-ref/source/monplace.cc at line 719 [6.1641732]

B:BD[7.3653] → [8.3209:3257]

    return _valid_monster_location(mg, mg.pos);

[7.3653]

[13.5684]

    return _valid_monster_generation_location(mg, mg.pos);

Replacement in crawl-ref/source/monplace.cc at line 820 [6.1641732]

B:BD[14.10488] → [8.3258:3304]

            if (!_valid_monster_location(mg))

[14.10488]

[6.1647380]

            if (!_valid_monster_generation_location(mg))

Replacement in crawl-ref/source/monplace.cc at line 891 [6.1641732]
B:BD[7.3884] → [8.3305:3348]
```
    else if (!_valid_monster_location(mg))
```
[7.3884]
[7.3927]
```
    else if (!_valid_monster_generation_location(mg))
```

Replacement in crawl-ref/source/monplace.cc at line 1037 [6.1641732]

B:BD[6.1653239] → [8.3349:3400]

            if (_valid_monster_location(mg, fpos))

[6.1653239]

[7.4068]

            if (_valid_monster_generation_location(mg, fpos))