fiddlerwoaroof/crawl - Change OYYZVCE3QHBVJM6IEKK5HTJRG5YOVQNCBRMSJENTHOI2WPJLNCFAC

Fix 1921769: Exclusion squares on the tiles minimap sometimes

         not being updated.

Also add yet another minimap colour option for the centre of an exclusion (defaults to darkblue).

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

Created by j-p-e-g on March 30, 2008

OYYZVCE3QHBVJM6IEKK5HTJRG5YOVQNCBRMSJENTHOI2WPJLNCFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 254 [8.39949]

B:BD[7.307] → [7.307:340]

B:BD[7.340] → [4.135:172]

    for (int x = -8; x < 8; x++)
        for (int y = -8; y < 8; y++)

[7.307]

[4.172]

    for (int x = -8; x <= 8; x++)
        for (int y = -8; y <= 8; y++)

Insertion in crawl-ref/source/travel.cc at line 261 [8.39949]
[4.344]
[7.543]
```
        
```
Deletion in crawl-ref/source/player.cc at line 2765 [10.962854]
∅:D[9.582] → [10.1006702:1006708]
B:BD[10.1006702] → [10.1006702:1006708]
```
    {
```
Replacement in crawl-ref/source/player.cc at line 2773 [10.962854]
B:BD[10.1006899] → [10.1006899:1006905]
```
    }
```
[10.1006899]
[11.5747363]
```
        
```

Replacement in crawl-ref/source/player.cc at line 5122 [10.962854]

B:BD[12.585] → [12.585:622]

B:BD[12.622] → [13.49672:49744]

        if (you.equip[slot] != -1 &&
            get_armour_ego_type(you.inv[you.equip[slot]]) == which_ego)

[12.585]

[12.688]

        if (you.equip[slot] != -1
            && get_armour_ego_type(you.inv[you.equip[slot]]) == which_ego)
        {

Insertion in crawl-ref/source/player.cc at line 5126 [10.962854]
[12.710]
[12.710]
```
        }
        
```

Replacement in crawl-ref/source/player.cc at line 6648 [10.962854]

B:BD[14.10398] → [14.10398:10536]

        if ((visited_only && branch_info[i].num_visits == 0) ||
            (dungeon_only && branch_info[i].level_type != LEVEL_DUNGEON))

[14.10398]

[14.10536]

        if (visited_only && branch_info[i].num_visits == 0
            || dungeon_only && branch_info[i].level_type != LEVEL_DUNGEON)
        {

Insertion in crawl-ref/source/player.cc at line 6652 [10.962854]
[14.10558]
[14.10558]
```
        }
```

Replacement in crawl-ref/source/player.cc at line 6658 [10.962854]

B:BD[14.10668] → [14.10668:10814]

        if ((visited_only && non_branch_info[i].num_visits == 0) ||
            (dungeon_only && non_branch_info[i].level_type != LEVEL_DUNGEON))

[14.10668]

[14.10814]

        if (visited_only && non_branch_info[i].num_visits == 0
            || dungeon_only && non_branch_info[i].level_type != LEVEL_DUNGEON)
        {

Insertion in crawl-ref/source/player.cc at line 6662 [10.962854]
[14.10836]
[14.10836]
```
        }
```
Insertion in crawl-ref/source/misc.cc at line 914 [10.1933596]
[15.748]
[15.748]
```
    {
```
Insertion in crawl-ref/source/misc.cc at line 917 [10.1933596]
[15.836]
[10.1947805]
```
    }
```
Deletion in crawl-ref/source/misc.cc at line 929 [10.1933596]
B:BD[16.545189] → [17.119213:119277]
```
#ifdef USE_TILE
    TileNewLevel(newlevel);
#endif // USE_TILE
```
Insertion in crawl-ref/source/misc.cc at line 957 [10.1933596]
[2.234]
[8.249229]
```
#ifdef USE_TILE
    TileNewLevel(newlevel);
#endif // USE_TILE
```

Replacement in crawl-ref/source/misc.cc at line 991 [10.1933596]

B:BD[8.250619] → [8.250619:250750]

            if (new_level_id.branch == BRANCH_MAIN_DUNGEON &&
                    old_level_id.branch == BRANCH_VESTIBULE_OF_HELL)

[8.250619]

[8.250750]

            if (new_level_id.branch == BRANCH_MAIN_DUNGEON
                && old_level_id.branch == BRANCH_VESTIBULE_OF_HELL)

Replacement in crawl-ref/source/misc.cc at line 1024 [10.1933596]

B:BD[10.1948259] → [14.12495:12559]

    const level_area_type      old_level_type = you.level_type;

[10.1948259]

[18.1740]

    const level_area_type  old_level_type = you.level_type;

Insertion in crawl-ref/source/misc.cc at line 1430 [10.1933596]
[19.10203]
[19.10203]
```
    {
```
Insertion in crawl-ref/source/misc.cc at line 1432 [10.1933596]
[19.10229]
[19.10229]
```
    }
```
Deletion in crawl-ref/source/misc.cc at line 1475 [10.1933596]
B:BD[10.1959080] → [10.1959080:1959081]
B:BD[10.1959081] → [17.119278:119329]
```
#ifdef USE_TILE
    TileNewLevel(newlevel);
#endif
```
Insertion in crawl-ref/source/misc.cc at line 1495 [10.1933596]
[2.270]
[8.252493]
```
#ifdef USE_TILE
    TileNewLevel(newlevel);
#endif // USE_TILE
```
Replacement in crawl-ref/source/misc.cc at line 1514 [10.1933596]
B:BD[8.253108] → [8.253108:253143]
```
            lp.id  = new_level_id;
```
[8.253108]
[8.253143]
```
            lp.id    = new_level_id;
```
Replacement in crawl-ref/source/libgui.cc at line 314 [11.5793336]
B:BD[11.5802937] → [11.5802937:5802956]
```
    inv_idx = idx;
```
[11.5802937]
[11.5802956]
```
    inv_idx    = idx;
```

Replacement in crawl-ref/source/libgui.cc at line 380 [11.5793336]

∅:D[3.3276] → [20.4301:4418]

B:BD[7.3245] → [20.4301:4418]

        if (c == Options.tile_floor_col && is_excluded( coord_def(x,y) ))
            c = Options.tile_excluded_col;

[3.3276]

[11.5804139]

        if (c == Options.tile_floor_col || c == Options.tile_item_col)
        {
            if (is_exclude_root( coord_def(x,y) ))
                c = Options.tile_excl_centre_col;
            else if (c == Options.tile_floor_col && is_excluded(coord_def(x,y)))
                c = Options.tile_excluded_col;
        }

Deletion in crawl-ref/source/libgui.cc at line 438 [11.5793336]
B:BD[11.5805423] → [11.5805423:5805429]
```
    {
```
Deletion in crawl-ref/source/libgui.cc at line 439 [11.5793336]
B:BD[11.5805463] → [11.5805463:5805473]
```
        {
```
Deletion in crawl-ref/source/libgui.cc at line 440 [11.5793336]
B:BD[11.5805537] → [11.5805537:5805553]
```
        }
    }
```
Deletion in crawl-ref/source/libgui.cc at line 449 [11.5793336]
∅:D[21.2742] → [11.5805719:5805725]
B:BD[11.5805719] → [11.5805719:5805725]
```
    {
```
Deletion in crawl-ref/source/libgui.cc at line 450 [11.5793336]
B:BD[11.5805746] → [11.5805746:5805752]
```
    }
```
Insertion in crawl-ref/source/initfile.cc at line 828 [10.2957258]
[20.6057]
[10.2966239]
```
    tile_excl_centre_col = MAP_DKBLUE;
```

Insertion in crawl-ref/source/initfile.cc at line 2836 [10.2957258]

[20.7924]

[5.15621]

               _str_to_tile_colour(field);
    }
    else if (key == "tile_excl_centre_col" || key == "tile_excl_center_col")
    {
        tile_excl_centre_col =

Insertion in crawl-ref/source/externs.h at line 1787 [10.3270163]
[20.8546]
[11.5933096]
```
    char        tile_excl_centre_col;
```
Insertion in crawl-ref/init.txt at line 297 [10.4830895]
[20.9148]
[20.9148]
```
# tile_excl_centre     = darkblue
```

Replacement in crawl-ref/docs/options_guide.txt at line 85 [23.63392]

B:BD[22.4046] → [22.4046:4111]

                tile_water_col, tile_lava_col, tile_excluded_col

[22.4046]

[24.4130]

                tile_water_col, tile_lava_col, tile_excluded_col,
		tile_excl_centre_col

Insertion in crawl-ref/docs/options_guide.txt at line 1321 [23.63392]
[20.10040]
[20.10040]
```
tile_excl_centre_col = darkblue
```

Insertion in crawl-ref/docs/options_guide.txt at line 1344 [23.63392]

[20.11413]

[11.5939912]

           tile_excl_centre_col  - colour of exclusion centre (overrides
	                           tile_floor_col and tile_item_col, only)

Replacement in crawl-ref/docs/options_guide.txt at line 1760 [23.63392]
B:BD[25.5280] → [6.3772:3823]
```
: crawl.read_options('docs/034_monster_glyphs.txt')
```
[25.5280]
```
: crawl.read_options('docs/034_monster_glyphs.txt')
```

Fix 1921769: Exclusion squares on the tiles minimap sometimes

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 254 [8.39949]

Insertion in crawl-ref/source/travel.cc at line 261 [8.39949]

Deletion in crawl-ref/source/player.cc at line 2765 [10.962854]

Replacement in crawl-ref/source/player.cc at line 2773 [10.962854]

Replacement in crawl-ref/source/player.cc at line 5122 [10.962854]

Insertion in crawl-ref/source/player.cc at line 5126 [10.962854]

Replacement in crawl-ref/source/player.cc at line 6648 [10.962854]

Insertion in crawl-ref/source/player.cc at line 6652 [10.962854]

Replacement in crawl-ref/source/player.cc at line 6658 [10.962854]

Insertion in crawl-ref/source/player.cc at line 6662 [10.962854]

Insertion in crawl-ref/source/misc.cc at line 914 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 917 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 929 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 957 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 991 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 1024 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 1430 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 1432 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 1475 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 1495 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 1514 [10.1933596]

Replacement in crawl-ref/source/libgui.cc at line 314 [11.5793336]

Replacement in crawl-ref/source/libgui.cc at line 380 [11.5793336]

Deletion in crawl-ref/source/libgui.cc at line 438 [11.5793336]

Deletion in crawl-ref/source/libgui.cc at line 439 [11.5793336]

Deletion in crawl-ref/source/libgui.cc at line 440 [11.5793336]

Deletion in crawl-ref/source/libgui.cc at line 449 [11.5793336]

Deletion in crawl-ref/source/libgui.cc at line 450 [11.5793336]

Insertion in crawl-ref/source/initfile.cc at line 828 [10.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2836 [10.2957258]

Insertion in crawl-ref/source/externs.h at line 1787 [10.3270163]

Insertion in crawl-ref/init.txt at line 297 [10.4830895]

Replacement in crawl-ref/docs/options_guide.txt at line 85 [23.63392]

Insertion in crawl-ref/docs/options_guide.txt at line 1321 [23.63392]

Insertion in crawl-ref/docs/options_guide.txt at line 1344 [23.63392]

Replacement in crawl-ref/docs/options_guide.txt at line 1760 [23.63392]