diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 20:43:15 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 20:43:15 +0000 |
| commit | f116902db8e7f917df91a3a1e775cc43cf7dd47a (patch) | |
| tree | 8ce9e5477928410e415ac3244babeed341a40f09 /crawl-ref/source/player.cc | |
| parent | a932874b76f5657f943d879c2a0b36dab2cc3f68 (diff) | |
| download | crawl-ref-f116902db8e7f917df91a3a1e775cc43cf7dd47a.tar.gz crawl-ref-f116902db8e7f917df91a3a1e775cc43cf7dd47a.zip | |
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
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index a23525e898..bdc7ba2615 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -2762,7 +2762,6 @@ void forget_map(unsigned char chance_forgotten, bool force) return; for (unsigned char xcount = 0; xcount < GXM; xcount++) - { for (unsigned char ycount = 0; ycount < GYM; ycount++) { if (!see_grid(xcount, ycount) && @@ -2771,7 +2770,7 @@ void forget_map(unsigned char chance_forgotten, bool force) env.map[xcount][ycount].clear(); } } - } + #ifdef USE_TILE GmapInit(false); tile_clear_buf(); @@ -5120,9 +5119,12 @@ int count_worn_ego( int which_ego ) { int result = 0; for ( int slot = EQ_CLOAK; slot <= EQ_BODY_ARMOUR; ++slot ) - if (you.equip[slot] != -1 && - get_armour_ego_type(you.inv[you.equip[slot]]) == which_ego) + if (you.equip[slot] != -1 + && get_armour_ego_type(you.inv[you.equip[slot]]) == which_ego) + { result++; + } + return result; } @@ -6643,17 +6645,21 @@ std::vector<PlaceInfo> player::get_all_place_info(bool visited_only, for (int i = 0; i < NUM_BRANCHES; i++) { - if ((visited_only && branch_info[i].num_visits == 0) || - (dungeon_only && branch_info[i].level_type != LEVEL_DUNGEON)) + if (visited_only && branch_info[i].num_visits == 0 + || dungeon_only && branch_info[i].level_type != LEVEL_DUNGEON) + { continue; + } list.push_back(branch_info[i]); } for (int i = 0; i < (NUM_LEVEL_AREA_TYPES - 1); i++) { - if ((visited_only && non_branch_info[i].num_visits == 0) || - (dungeon_only && non_branch_info[i].level_type != LEVEL_DUNGEON)) + if (visited_only && non_branch_info[i].num_visits == 0 + || dungeon_only && non_branch_info[i].level_type != LEVEL_DUNGEON) + { continue; + } list.push_back(non_branch_info[i]); } |