fiddlerwoaroof/crawl - Change UHHYCNP2ORVHPBAQHSLYJ6NDFLE5WPFHW5ZG27MJYBLDAZ5WFOMAC

Simplification.

Created by Robert Vollmert on October 17, 2009

UHHYCNP2ORVHPBAQHSLYJ6NDFLE5WPFHW5ZG27MJYBLDAZ5WFOMAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 442 [6.16817]

[4.6679]

[5.373]

        const dungeon_feature_type feat =
            static_cast<dungeon_feature_type>(object);

Replacement in crawl-ref/source/view.cc at line 453 [6.16817]

B:BD[7.28] → [8.120:261]

            bool excluded_stairs = (object >= DNGN_STONE_STAIRS_DOWN_I
                                    && object <= DNGN_ESCAPE_HATCH_UP

[7.28]

[8.261]

            // TODO: consolidate with feat_is_stair etc.
            bool excluded_stairs = (feat >= DNGN_STONE_STAIRS_DOWN_I
                                    && feat <= DNGN_ESCAPE_HATCH_UP

Replacement in crawl-ref/source/view.cc at line 460 [6.16817]

B:BD[8.360] → [8.360:427]

                && object < NUM_FEATURES && object >= DNGN_MINMOVE

[8.360]

[9.7]

                && feat >= DNGN_MINMOVE

Deletion in crawl-ref/source/view.cc at line 480 [6.16817]
B:BD[8.461] → [8.461:475]
```
            {
```
Deletion in crawl-ref/source/view.cc at line 481 [6.16817]
B:BD[8.532] → [8.532:546]
```
            }
```
Deletion in crawl-ref/source/view.cc at line 482 [6.16817]
∅:D[8.585] → [10.832:846]
B:BD[10.832] → [10.832:846]
```
            {
```

Replacement in crawl-ref/source/view.cc at line 483 [6.16817]

B:BD[10.892] → [10.892:1026]

            }
            else if (object < NUM_REAL_FEATURES && object >= DNGN_MINMOVE
                     && is_sanctuary(where) )

[10.892]

[11.375]

            else if (feat >= DNGN_MINMOVE && is_sanctuary(where))

Replacement in crawl-ref/source/view.cc at line 497 [6.16817]
B:BD[12.591] → [13.1827:1905]
∅:D[14.1431] → [12.666:680]
∅:D[13.1905] → [12.666:680]
B:BD[12.666] → [12.666:680]
```
            else if (object < NUM_REAL_FEATURES && _show_bloodcovered(where))
            {
```
[12.591]
[12.680]
```
            else if (_show_bloodcovered(where))
```
Replacement in crawl-ref/source/view.cc at line 499 [6.16817]
∅:D[12.721] → [11.884:898]
B:BD[11.884] → [11.884:898]
B:BD[11.898] → [13.1906:1982]
∅:D[12.797] → [7.98:112]
∅:D[13.1982] → [7.98:112]
B:BD[7.98] → [7.98:112]
```
            }
            else if (object < NUM_REAL_FEATURES && env.grid_colours(where))
            {
```
[12.721]
[13.1983]
```
            else if (env.grid_colours(where))
```
Deletion in crawl-ref/source/view.cc at line 501 [6.16817]
∅:D[13.2044] → [7.172:186]
B:BD[7.172] → [7.172:186]
```
            }
```

Replacement in crawl-ref/source/view.cc at line 507 [6.16817]

B:BD[7.418] → [3.235:282]

                else if (object == DNGN_TREES)

[7.418]

[3.282]

                else if (feat == DNGN_TREES)

Replacement in crawl-ref/source/view.cc at line 512 [6.16817]

∅:D[10.1045] → [7.488:518]

B:BD[7.488] → [7.488:518]

B:BD[7.518] → [14.1432:1481]

B:BD[14.1481] → [13.2045:2123]

∅:D[13.2123] → [7.643:707]

B:BD[7.643] → [7.643:707]

                    *colour =
                        _view_emphasised_colour(
                            where, static_cast<dungeon_feature_type>(object),
                            *colour, fdef.em_colour | colmask);

[10.1045]

[10.1046]

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

Replacement in crawl-ref/source/view.cc at line 517 [6.16817]

B:BD[15.31] → [2.6:49]

∅:D[2.49] → [16.180:253]

B:BD[13.2189] → [16.180:253]

∅:D[16.253] → [17.83:141]

B:BD[17.83] → [17.83:141]

            if (object < NUM_REAL_FEATURES
                && (object >= DNGN_FLOOR_MIN && object <= DNGN_FLOOR_MAX
                    || object == DNGN_UNDISCOVERED_TRAP))

[15.31]

[15.137]

            // TODO: should be a feat_is_whatever(feat)
            if (feat >= DNGN_FLOOR_MIN && feat <= DNGN_FLOOR_MAX
                || feat == DNGN_UNDISCOVERED_TRAP)

Replacement in crawl-ref/source/view.cc at line 536 [6.16817]
∅:D[18.253] → [19.181:256]
∅:D[5.916] → [19.181:256]
∅:D[10.1125] → [19.181:256]
∅:D[13.2242] → [19.181:256]
B:BD[20.3544] → [19.181:256]
B:BD[19.256] → [13.2243:2284]
```
            seen_notable_thing( static_cast<dungeon_feature_type>(object),
                                where );
```
[10.1125]
[10.1126]
```
            seen_notable_thing(feat, where);
```

Replacement in crawl-ref/source/view.cc at line 541 [6.16817]

B:BD[4.7040] → [4.7040:7152]

        ASSERT( object >= DNGN_START_OF_MONSTERS );
        *ch = mons_char( object - DNGN_START_OF_MONSTERS );

[4.7040]

[4.7152]

        ASSERT(object >= DNGN_START_OF_MONSTERS);
        *ch = mons_char(object - DNGN_START_OF_MONSTERS);

Simplification.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 442 [6.16817]

Replacement in crawl-ref/source/view.cc at line 453 [6.16817]

Replacement in crawl-ref/source/view.cc at line 460 [6.16817]

Deletion in crawl-ref/source/view.cc at line 480 [6.16817]

Deletion in crawl-ref/source/view.cc at line 481 [6.16817]

Deletion in crawl-ref/source/view.cc at line 482 [6.16817]

Replacement in crawl-ref/source/view.cc at line 483 [6.16817]

Replacement in crawl-ref/source/view.cc at line 497 [6.16817]

Replacement in crawl-ref/source/view.cc at line 499 [6.16817]

Deletion in crawl-ref/source/view.cc at line 501 [6.16817]

Replacement in crawl-ref/source/view.cc at line 507 [6.16817]

Replacement in crawl-ref/source/view.cc at line 512 [6.16817]

Replacement in crawl-ref/source/view.cc at line 517 [6.16817]

Replacement in crawl-ref/source/view.cc at line 536 [6.16817]

Replacement in crawl-ref/source/view.cc at line 541 [6.16817]