fiddlerwoaroof/crawl - Change XP2DL4CJ7FH2IPNNA6KHNOAFW6J2RSC44JWEGLYQHWUMU5EVHFUQC

Forward-port the remaining applicable parts of 0.5 r10447.

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

Created by dolorous on July 28, 2009

XP2DL4CJ7FH2IPNNA6KHNOAFW6J2RSC44JWEGLYQHWUMU5EVHFUQC

Dependencies

In channels

main

Change contents

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

B:BD[4.39967] → [3.155:189]

        if (is_terrain_mapped(p))

[4.39967]

[5.60]

#ifdef USE_TILE
        if (is_terrain_mapped(p) && !is_envmap_detected_mons(p))

Insertion in crawl-ref/source/view.cc at line 832 [4.16817]
[5.82]
[5.82]
```
#endif
```

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

∅:D[5.83] → [6.7:77]

B:BD[4.39967] → [6.7:77]

        set_envmap_obj(p, is_terrain_known(p)? grd(p) : DNGN_UNSEEN);

[5.83]

[7.1273]

        set_envmap_obj(p, is_terrain_seen(p) || is_terrain_mapped(p)
                ? grd(p) : DNGN_UNSEEN);

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

B:BD[8.1079] → [6.78:148]

∅:D[6.148] → [7.1422:1611]

B:BD[7.1422] → [7.1422:1611]

        set_envmap_obj(p, is_terrain_known(p)? grd(p) : DNGN_UNSEEN);
        env.tile_bk_fg(p) = 0;
        env.tile_bk_bg(p) = is_terrain_known(p) ?
            tile_idx_unseen_terrain(p.x, p.y, grd(p)) :
            tileidx_feature(DNGN_UNSEEN, p.x, p.y);

[8.1079]

[8.1356]

        if (is_terrain_mapped(p))
        {
            unsigned int feature = grd(p);
            unsigned int grid_symbol;
            unsigned short grid_colour;
            get_item_symbol(feature, &grid_symbol, &grid_colour);
            unsigned int fg;
            unsigned int bg;
            tileidx_unseen(fg, bg, grid_symbol, p);
            env.tile_bk_bg(p) = bg;
            env.tile_bk_fg(p) = fg;
        }
        else
        {
            env.tile_bk_bg(p) = is_terrain_seen(p) ?
                tile_idx_unseen_terrain(p.x, p.y, grd(p)) :
                tileidx_feature(DNGN_UNSEEN, p.x, p.y);
            env.tile_bk_fg(p) = 0;
        }

Insertion in crawl-ref/source/view.cc at line 3993 [4.16817]
[4.79591]
[8.2917]
```
#if 0
```

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

B:BD[9.5363] → [9.5363:5504]

            env.tile_bk_bg(*ri) = tile_idx_unseen_terrain(ri->x, ri->y,
                                                          grd(*ri));

[9.5363]

[9.5504]

            if (is_terrain_seen(*ri))
            {
                env.tile_bk_bg(*ri) = tile_idx_unseen_terrain(ri->x, ri->y,
                                                              grd(*ri));
            }
            else
            {
                unsigned int feature = grd(*ri);
                unsigned int grid_symbol;
                unsigned short grid_color;
                get_item_symbol(feature, &grid_symbol, &grid_color);
                unsigned int fg;
                unsigned int bg;
                tileidx_unseen(fg, bg, grid_symbol, *ri);
                env.tile_bk_bg(*ri) = bg;
            }

Insertion in crawl-ref/source/view.cc at line 4017 [4.16817]
[9.5514]
[8.3217]
```
#endif
```

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

B:BD[10.10] → [2.4656:4732]

        if (!wizard_map && (is_terrain_known(*ri) || is_terrain_seen(*ri)))

[10.10]

[9.5574]

        if (!wizard_map && (is_terrain_seen(*ri) || is_terrain_mapped(*ri)))

Insertion in crawl-ref/source/view.cc at line 4045 [4.16817]
[11.35]
[11.35]
```
            {
```

Insertion in crawl-ref/source/view.cc at line 4047 [4.16817]

[11.74]

[9.6479]

#ifdef USE_TILE
                // Can't use set_envmap_obj because that would
                // overwrite the gmap.
                env.tile_bk_bg(*ri) = tile_idx_unseen_terrain(ri->x, ri->y,
                                                              grd(*ri));
#endif
            }

Replacement in crawl-ref/source/spells2.cc at line 201 [4.569242]

B:BD[9.32028] → [9.32028:32059]

∅:D[9.32059] → [4.572651:572652]

B:BD[4.572651] → [4.572651:572652]

B:BD[4.572652] → [9.32060:32133]

            creatures_found++;
            _mark_detected_creature(*ri, mon, fuzz_chance, fuzz_radius);

[4.572559]

[12.275]

            // If you can see the monster, don't "detect" it elsewhere.
            if (!mons_near(mon) || !player_monster_visible(mon))
            {
                creatures_found++;
                _mark_detected_creature(*ri, mon, fuzz_chance, fuzz_radius);
            }