fiddlerwoaroof/crawl - Change KO7TLN7OM7UQF33RRTOFPFTDQLTYCOE4N7KWQUTWRIUSEB6PQ4WQC

Add miscellaneous minor fixes.

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

Created by dolorous on December 30, 2008

KO7TLN7OM7UQF33RRTOFPFTDQLTYCOE4N7KWQUTWRIUSEB6PQ4WQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/stuff.cc at line 345 [6.224557]
B:BD[5.523] → [5.523:559]
```
        || !fmenv->can_use_stairs()
```
Insertion in crawl-ref/source/stuff.cc at line 346 [6.224557]
[7.323]
[7.323]
```
        || !mons_can_use_stairs(fmenv)
```

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

B:BD[4.2790] → [4.2790:2864]

                // Don't allow zombified monsters to be placed at stairs.

[4.2790]

[4.2864]

                // Don't allow monsters too stupid to use stairs (e.g.
                // zombified undead) to be placed at stairs.

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

B:BD[4.2914] → [4.2914:2973]

                    || !mons_class_is_zombified(mon_type))

[4.2914]

[4.2973]

                    || mons_class_can_use_stairs(mon_type))

Replacement in crawl-ref/source/mon-util.h at line 496 [6.1682293]

B:BD[8.493] → [9.9774:9845]

∅:D[9.9845] → [10.3178:3299]

B:BD[8.493] → [10.3178:3299]

bool mon_can_see_monster( const monsters *mon, const monsters *targ );
bool mons_monster_visible( const monsters *mon, const monsters *targ );
bool mons_player_visible( const monsters *mon );

[8.493]

[6.1689481]

bool mon_can_see_monster(const monsters *mon, const monsters *targ);
bool mons_monster_visible(const monsters *mon, const monsters *targ);
bool mons_player_visible(const monsters *mon);

Insertion in crawl-ref/source/mon-util.h at line 641 [6.1682293]

[11.4205]

[12.7565]

bool mons_class_can_use_stairs(int mc);
bool mons_can_use_stairs(const monsters *mon);

Replacement in crawl-ref/source/mon-util.h at line 770 [6.1682293]
∅:D[13.2891] → [14.264:303]
∅:D[15.2988] → [14.264:303]
∅:D[16.4238] → [14.264:303]
B:BD[17.464645] → [14.264:303]
∅:D[14.303] → [18.120:149]
B:BD[18.120] → [18.120:149]
```
bool mons_is_icy(const monsters *mon);
bool mons_is_icy(int mtype);
```
[15.2988]
[15.2989]
```
bool mons_is_icy(int mc);
```
Replacement in crawl-ref/source/mon-util.cc at line 597 [6.1699344]
∅:D[19.6319] → [14.1786:1824]
∅:D[20.7540] → [14.1786:1824]
∅:D[21.13999] → [14.1786:1824]
B:BD[17.470176] → [14.1786:1824]
```
bool mons_is_icy(const monsters *mon)
```
[19.6319]
[18.190]
```
bool mons_is_icy(int mc)
```

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

B:BD[18.192] → [14.1825:1862]

    return (mons_is_icy(mon->type));

[18.192]

[18.230]

    return (mc == MONS_ICE_BEAST
            || mc == MONS_SIMULACRUM_SMALL
            || mc == MONS_SIMULACRUM_LARGE
            || mc == MONS_ICE_STATUE);

Deletion in crawl-ref/source/mon-util.cc at line 605 [6.1699344]

B:BD[18.233] → [18.233:436]

bool mons_is_icy(int mtype)
{
    return (mtype == MONS_ICE_BEAST
            || mtype == MONS_SIMULACRUM_SMALL
            || mtype == MONS_SIMULACRUM_LARGE
            || mtype == MONS_ICE_STATUE);
}

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

B:BD[6.1706538] → [9.9847:9917]

bool mon_can_see_monster( const monsters *mon, const monsters *targ )

[6.1706538]

[9.9917]

bool mon_can_see_monster(const monsters *mon, const monsters *targ)

Deletion in crawl-ref/source/mon-util.cc at line 822 [6.1699344]
B:BD[9.10037] → [9.10037:10038]

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

B:BD[6.1706675] → [10.3301:3372]

bool mons_monster_visible( const monsters *mon, const monsters *targ )

[6.1706675]

[6.1706748]

bool mons_monster_visible(const monsters *mon, const monsters *targ)

Replacement in crawl-ref/source/mon-util.cc at line 837 [6.1699344]
B:BD[6.1707062] → [10.3373:3421]
```
bool mons_player_visible( const monsters *mon )
```
[6.1707062]
[6.1707111]
```
bool mons_player_visible(const monsters *mon)
```

Insertion in crawl-ref/source/mon-util.cc at line 932 [6.1699344]

[12.10422]

bool mons_class_can_use_stairs(int mc)
{
    return (!mons_class_is_zombified(mc));
}
bool mons_can_use_stairs(const monsters *mon)
{
    return (!mons_is_zombified(mon) || mons_enslaved_intact_soul(mon));
}

Replacement in crawl-ref/source/mon-util.cc at line 3170 [6.1699344]
∅:D[3.2632] → [5.3511:3541]
B:BD[5.3511] → [5.3511:3541]
```
    if (!m->can_use_stairs())
```
[3.2632]
[5.3541]
```
    if (!mons_can_use_stairs(m))
```

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

B:BD[2.2740] → [2.2740:2839]

    if (m1->holiness() == m2->holiness() && m1->can_use_stairs()
        && !m2->can_use_stairs())

[2.2740]

[2.2839]

    if (m1->holiness() == m2->holiness() && mons_can_use_stairs(m1)
        && !mons_can_use_stairs(m2))

Deletion in crawl-ref/source/mon-util.cc at line 5853 [6.1699344]
B:BD[22.11783] → [7.3053:3093]
B:BD[7.3093] → [5.4018:4092]
∅:D[23.2559] → [7.3237:3240]
∅:D[24.2735] → [7.3237:3240]
∅:D[25.2758] → [7.3237:3240]
∅:D[5.4092] → [7.3237:3240]
B:BD[7.3237] → [7.3237:3240]
```
bool monsters::can_use_stairs() const
{
    return (!mons_is_zombified(this) || mons_enslaved_intact_soul(this));
}
```

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

B:BD[26.2526] → [7.3241:3281]

                   && can_use_stairs())

[26.2526]

[27.12634]

                   && mons_can_use_stairs(this))

Deletion in crawl-ref/source/externs.h at line 1341 [6.3270163]
B:BD[22.14061] → [7.3364:3397]
```
    bool can_use_stairs() const;
```
Replacement in crawl-ref/source/describe.cc at line 2730 [6.3736416]
B:BD[6.3940351] → [4.3807:3839]
```
    if (!mons.can_use_stairs())
```
[6.3940351]
[4.3839]
```
    if (!mons_can_use_stairs(&mons))
```
Replacement in crawl-ref/source/beam.cc at line 2068 [6.4128068]
B:BD[6.4180448] → [18.707:745]
```
            if (mons_is_icy(monster))
```
[6.4180448]
[6.4180613]
```
            if (mons_is_icy(monster->type))
```
Replacement in crawl-ref/source/beam.cc at line 2288 [6.4128068]
B:BD[6.4185238] → [18.746:784]
```
            if (mons_is_icy(monster))
```
[6.4185238]
[6.4185403]
```
            if (mons_is_icy(monster->type))
```
Replacement in crawl-ref/source/beam.cc at line 2319 [6.4128068]
B:BD[6.4186267] → [18.785:823]
```
            if (mons_is_icy(monster))
```
[6.4186267]
[6.4186432]
```
            if (mons_is_icy(monster->type))
```

Replacement in crawl-ref/source/beam.cc at line 2378 [6.4128068]

B:BD[28.743] → [28.743:804]

        if (mons_class_holiness(monster->type) != MH_UNDEAD)

[28.743]

[28.804]

        if (mons_holiness(monster) != MH_UNDEAD)

Replacement in crawl-ref/source/beam.cc at line 2381 [6.4128068]

B:BD[28.832] → [28.832:885]

        if (check_mons_resist_magic( monster, pow ))

[28.832]

[28.885]

        if (check_mons_resist_magic(monster, pow))

Add miscellaneous minor fixes.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/stuff.cc at line 345 [6.224557]

Insertion in crawl-ref/source/stuff.cc at line 346 [6.224557]

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

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

Replacement in crawl-ref/source/mon-util.h at line 496 [6.1682293]

Insertion in crawl-ref/source/mon-util.h at line 641 [6.1682293]

Replacement in crawl-ref/source/mon-util.h at line 770 [6.1682293]

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

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

Deletion in crawl-ref/source/mon-util.cc at line 605 [6.1699344]

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

Deletion in crawl-ref/source/mon-util.cc at line 822 [6.1699344]

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

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

Insertion in crawl-ref/source/mon-util.cc at line 932 [6.1699344]

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

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

Deletion in crawl-ref/source/mon-util.cc at line 5853 [6.1699344]

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

Deletion in crawl-ref/source/externs.h at line 1341 [6.3270163]

Replacement in crawl-ref/source/describe.cc at line 2730 [6.3736416]

Replacement in crawl-ref/source/beam.cc at line 2068 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 2288 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 2319 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 2378 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 2381 [6.4128068]