fiddlerwoaroof/crawl - Change ELI7J66INCTV6Y3ALKDLPYLIR5AALWY7ZJZP6NFHYQUZMXWRC3LAC

Simplify unknown stair emphasis.

Created by Robert Vollmert on October 17, 2009

ELI7J66INCTV6Y3ALKDLPYLIR5AALWY7ZJZP6NFHYQUZMXWRC3LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 398 [4.16817]

B:BD[4.33008] → [5.1268:1389]

∅:D[5.1389] → [6.1058:1123]

B:BD[6.1058] → [6.1058:1123]

static int _view_emphasised_colour(const coord_def& where,
                                   dungeon_feature_type feat,
                                   int oldcolour, int newcolour)

[4.33008]

[7.145]

static bool _emphasise(const coord_def& where, dungeon_feature_type feat)

Replacement in crawl-ref/source/view.cc at line 400 [4.16817]

B:BD[7.147] → [3.27:202]

∅:D[8.81] → [7.227:233]

∅:D[3.202] → [7.227:233]

∅:D[5.1460] → [7.227:233]

B:BD[7.227] → [7.227:233]

∅:D[9.17] → [7.307:339]

∅:D[10.143] → [7.307:339]

B:BD[7.307] → [7.307:339]

∅:D[9.28] → [7.339:369]

B:BD[7.339] → [7.339:369]

    if (is_unknown_stair(where, feat)
        && (you.your_level || feat_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
        && you.where_are_you != BRANCH_VESTIBULE_OF_HELL)
    {
            return (newcolour);
    }
    return (oldcolour);

[7.147]

[11.291]

    return (is_unknown_stair(where, feat)
            && (you.your_level || feat_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
            && you.where_are_you != BRANCH_VESTIBULE_OF_HELL);

Replacement in crawl-ref/source/view.cc at line 503 [4.16817]

B:BD[7.609] → [12.419:488]

                if (fdef.em_colour != fdef.colour && fdef.em_colour)

[7.609]

[9.1027]

                if (fdef.em_colour && fdef.em_colour != fdef.colour &&
                    _emphasise(where, feat))

Replacement in crawl-ref/source/view.cc at line 506 [4.16817]

B:BD[9.1045] → [2.549:686]

                    *colour = _view_emphasised_colour(where, feat,
                                  *colour, fdef.em_colour | colmask);

[9.1045]

[9.1046]

                    *colour = (fdef.em_colour | colmask);

Replacement in crawl-ref/source/view.cc at line 725 [4.16817]

B:BD[7.1093] → [7.1093:1218]

B:BD[7.1218] → [13.1422:1489]

∅:D[14.817] → [6.2014:2072]

∅:D[13.1489] → [6.2014:2072]

∅:D[5.2366] → [6.2014:2072]

B:BD[6.2014] → [6.2014:2072]

∅:D[6.2072] → [7.1344:1350]

B:BD[7.1344] → [7.1344:1350]

    if (terrain_seen && feature_colour != fdef.seen_em_colour
        && fdef.seen_em_colour)
    {
        feature_colour =
            _view_emphasised_colour(p, feat_value, feature_colour,
                                    fdef.seen_em_colour);
    }

[7.1093]

[4.38110]

    if (terrain_seen && fdef.seen_em_colour && _emphasise(p, feat_value))
        feature_colour = fdef.seen_em_colour;