fiddlerwoaroof/crawl - Change W45NU6ICYOPWOGDUDFQPWLP423VDRPSLBLRRRLEIVWKTWEXLIQ3AC

Move can_go_straight from los.cc to monstuff.cc.

Created by Robert Vollmert on October 8, 2009

W45NU6ICYOPWOGDUDFQPWLP423VDRPSLBLRRRLEIVWKTWEXLIQ3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.h at line 204 [4.1390580]

[2.4939]

[4.1396618]


bool can_go_straight(const coord_def& p1, const coord_def& p2,
                     dungeon_feature_type allowed);

Insertion in crawl-ref/source/monstuff.cc at line 3500 [4.1396662]

[5.3728]

// Checks whether there is a straight path from p1 to p2 that passes
// through features >= allowed.
// If it exists, such a path may be missed; on the other hand, it
// is not guaranteed that p2 is visible from p1 according to LOS rules.
// Not symmetric.
bool can_go_straight(const coord_def& p1, const coord_def& p2,
                     dungeon_feature_type allowed)
{
    if (distance(p1, p2) > get_los_radius_squared())
        return (false);
    dungeon_feature_type max_disallowed = DNGN_MAXOPAQUE;
    if (allowed != DNGN_UNSEEN)
        max_disallowed = static_cast<dungeon_feature_type>(allowed - 1);
    return (!num_feats_between(p1, p2, DNGN_UNSEEN, max_disallowed,
                               true, true));
}

Deletion in crawl-ref/source/los.h at line 31 [6.24780]

B:BD[3.5020] → [3.5020:5135]

bool can_go_straight(const coord_def& p1, const coord_def& p2,
                     dungeon_feature_type allowed);

Deletion in crawl-ref/source/los.cc at line 695 [6.26450]

B:BD[3.5469] → [3.5469:5840]

∅:D[3.5840] → [6.48721:48960]

B:BD[6.48721] → [6.48721:48960]

B:BD[6.48997] → [6.48997:49113]

// Checks whether there is a straight path from p1 to p2 that passes
// through features >= allowed.
// If it exists, such a path may be missed; on the other hand, it
// is not guaranteed that p2 is visible from p1 according to LOS rules.
// Not symmetric.
bool can_go_straight(const coord_def& p1, const coord_def& p2,
                     dungeon_feature_type allowed)
{
    if (distance(p1, p2) > _los_radius_squared)
        return (false);
    dungeon_feature_type max_disallowed = DNGN_MAXOPAQUE;
    if (allowed != DNGN_UNSEEN)
        max_disallowed = static_cast<dungeon_feature_type>(allowed - 1);
    return (!num_feats_between(p1, p2, DNGN_UNSEEN, max_disallowed,
                               true, true));
}