fiddlerwoaroof/crawl - Change XHNJ2W4AQHIF32P2ENIMMDLWAIFWP442KJIZC6RKS4HBJNZIHHBAC

Colour unvisited stone stairs white (can be customised with the feature option).

Fixed level compiler not croaking for bad monster names.

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

Created by dshaligram on June 28, 2007

XHNJ2W4AQHIF32P2ENIMMDLWAIFWP442KJIZC6RKS4HBJNZIHHBAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 306 [7.16817]

[7.33008]

[8.5]

static int view_emphasised_colour(int x, int y, dungeon_feature_type feat,
                                  int oldcolour, int newcolour)
{
    if (is_travelable_stair(feat) && !travel_cache.know_stair(coord_def(x, y)))
    {
        if (you.your_level || stair_direction(feat) == CMD_GO_DOWNSTAIRS)
            return (newcolour);
    }
    return (oldcolour);
}

Replacement in crawl-ref/source/view.cc at line 326 [7.16817]

B:BD[9.6679] → [4.6:115]

        *ch = magic_mapped? Feature[object].magic_symbol
                          : Feature[object].symbol;

[9.6679]

[7.33762]

        const feature_def &fdef = Feature[object];
        
        *ch = magic_mapped? fdef.magic_symbol
                          : fdef.symbol;

Replacement in crawl-ref/source/view.cc at line 336 [7.16817]

B:BD[10.3375] → [10.3375:3484]

            if (Feature[object].colour != BLACK)
                *colour = Feature[object].colour | colmask;

[10.3375]

[10.3484]

            if (fdef.colour != BLACK)
                *colour = fdef.colour | colmask;
            if (fdef.em_colour != fdef.colour && fdef.em_colour)
                *colour =
                    view_emphasised_colour(
                        x, y, static_cast<dungeon_feature_type>(object),
                        *colour, fdef.em_colour | colmask);

Replacement in crawl-ref/source/view.cc at line 347 [7.16817]
B:BD[9.6940] → [10.3495:3544]
```
        if ((x || y) && Feature[object].notable)
```
[9.6940]
[5.181]
```
        if ((x || y) && fdef.notable)
```

Replacement in crawl-ref/source/view.cc at line 515 [7.16817]

B:BD[9.8780] → [9.8780:8802]

B:BD[9.8802] → [10.4001:4065]

B:BD[10.4065] → [5.353:395]

    feature_colour = 
        is_terrain_seen(x, y)? Feature[grid_value].seen_colour 
        : Feature[grid_value].map_colour;

[9.8780]

[7.38110]

    const bool terrain_seen = is_terrain_seen(x, y);
    const feature_def &fdef = Feature[grid_value];
    feature_colour = terrain_seen? fdef.seen_colour : fdef.map_colour;
    if (terrain_seen && feature_colour != fdef.seen_em_colour
        && fdef.seen_em_colour)
    {
        feature_colour =
            view_emphasised_colour(x, y, grid_value, feature_colour,
                                   fdef.seen_em_colour);
    }

Insertion in crawl-ref/source/view.cc at line 3180 [7.16817]

[9.45344]

        if (ofeat.seen_em_colour)
            feat.seen_em_colour = ofeat.seen_em_colour;
        if (ofeat.em_colour)
            feat.em_colour = ofeat.em_colour;

Insertion in crawl-ref/source/view.cc at line 3198 [7.16817]

[9.45819]

[7.91347]

        Feature[i].seen_em_colour = BLACK;
        Feature[i].em_colour = BLACK;

Replacement in crawl-ref/source/view.cc at line 3363 [7.16817]

B:BD[9.51396] → [9.51396:51469]

B:BD[9.51469] → [2.193:236]

∅:D[2.236] → [9.51616:51657]

B:BD[9.51616] → [9.51616:51657]

            Feature[i].symbol = Options.char_table[ DCHAR_STAIRS_DOWN ];
            Feature[i].colour = LIGHTGREY;
            Feature[i].map_colour = RED;

[9.51396]

[9.51657]

            Feature[i].symbol         = Options.char_table[ DCHAR_STAIRS_DOWN ];
            Feature[i].colour         = LIGHTGREY;
            Feature[i].em_colour      = WHITE;
            Feature[i].map_colour     = RED;
            Feature[i].seen_em_colour = WHITE;

Insertion in crawl-ref/source/view.cc at line 3382 [7.16817]

[9.52082]

            Feature[i].em_colour      = WHITE;
            Feature[i].seen_em_colour = WHITE;

Replacement in crawl-ref/source/view.cc at line 3728 [7.16817]

B:BD[9.63446] → [9.63446:63541]

        if (!Feature[i].magic_symbol)
            Feature[i].magic_symbol = Feature[i].symbol;

[9.63446]

[7.101585]

        feature_def &f(Feature[i]);
        
        if (!f.magic_symbol)
            f.magic_symbol = f.symbol;

Replacement in crawl-ref/source/view.cc at line 3733 [7.16817]

B:BD[7.101586] → [9.63542:63647]

        if (Feature[i].seen_colour == BLACK)
            Feature[i].seen_colour = Feature[i].map_colour;

[7.101586]

[9.63647]

        if (f.seen_colour == BLACK)
            f.seen_colour = f.map_colour;
        if (f.seen_em_colour == BLACK)
            f.seen_em_colour = f.seen_colour;
        if (f.em_colour == BLACK)
            f.em_colour = f.colour;

Insertion in crawl-ref/source/travel.h at line 359 [11.29464]
[11.37042]
[11.37042]
```
    bool know_stair(const coord_def &pos) const;
```
Insertion in crawl-ref/source/travel.h at line 435 [11.29464]
[11.38995]
[11.38995]
```
    bool know_stair(const coord_def &c) const;
```

Insertion in crawl-ref/source/travel.cc at line 2856 [11.39949]

[11.117803]

bool LevelInfo::know_stair(const coord_def &c) const
{
    const int index = get_stair_index(c);
    if (index == -1)
        return (false);
    const level_pos &lp = stairs[index].destination;
    return (lp.is_valid());
}

Insertion in crawl-ref/source/travel.cc at line 3079 [11.39949]

[11.125047]

bool TravelCache::know_stair(const coord_def &c) const
{
    travel_levels_map::const_iterator i = levels.find(level_id::current());
    return (i == levels.end()? false : i->second.know_stair(c));
}

Replacement in crawl-ref/source/newgame.cc at line 258 [7.1132300]

B:BD[7.1138222] → [9.381772:381837]

        if (sp >= SP_WHITE_DRACONIAN && sp <= SP_BASE_DRACONIAN)

[7.1138222]

[7.1138287]

        if ((sp >= SP_WHITE_DRACONIAN && sp <= SP_BASE_DRACONIAN)
            || sp == SP_ELF)

Replacement in crawl-ref/source/mapdef.cc at line 1553 [9.594797]

B:BD[12.895] → [3.1326:1373]

            if (mspec.mid == MONS_PROGRAM_BUG)

[12.895]

[12.936]

            if (nspec.mid == MONS_PROGRAM_BUG)

Deletion in crawl-ref/source/mapdef.cc at line 1562 [9.594797]
B:BD[13.4100] → [13.4100:4101]
Replacement in crawl-ref/source/initfile.cc at line 851 [7.2957258]
B:BD[14.1504] → [14.1504:1552]
```
    if (iprops.size() < 1 || iprops.size() > 5)
```
[14.1504]
[14.1552]
```
    if (iprops.size() < 1 || iprops.size() > 7)
```

Replacement in crawl-ref/source/initfile.cc at line 854 [7.2957258]

B:BD[14.1569] → [14.1569:1622]

    if (iprops.size() < 5)
        iprops.resize(5);

[14.1569]

[14.1622]

    if (iprops.size() < 7)
        iprops.resize(7);

Insertion in crawl-ref/source/initfile.cc at line 873 [7.2957258]

[14.2225]

        fov.override.em_colour      = str_to_colour(iprops[5], BLACK);
        fov.override.seen_em_colour = str_to_colour(iprops[6], BLACK);

Insertion in crawl-ref/source/externs.h at line 1410 [7.3270163]

[14.3659]

    unsigned short      em_colour;       // Emphasised colour when in LoS.
    unsigned short      seen_em_colour;  // Emphasised colour when out of LoS

Replacement in crawl-ref/source/dat/entry.des at line 4486 [15.591]

B:BD[6.3156] → [6.3156:3239]

MONS: giant cockroach/giant ant/butterfly/killer bee/bumbleebee/redback/giant mite

[6.3156]

[6.3239]

MONS: giant cockroach/giant ant/butterfly/killer bee/bumblebee/redback/giant mite