fiddlerwoaroof/crawl - Change 47ADGRNSYVDBHB3JFKPZT7AUVWYTR54SCFMGGCQR2LWOUHAERQ3QC

Erase closed shops from the overmap.

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

Created by j-p-e-g on December 7, 2008

47ADGRNSYVDBHB3JFKPZT7AUVWYTR54SCFMGGCQR2LWOUHAERQ3QC

Dependencies

In channels

main

Change contents

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

[5.217]

                // Colour closed shops grey.
                if (grd(where) == DNGN_ENTER_SHOP && shop_is_closed(where))
                    *colour = LIGHTGREY | colmask;

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

B:BD[5.323] → [4.7:101]

                if (shop_is_closed(where))
                    *colour = LIGHTGREY | colmask;

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

∅:D[7.2189] → [8.8:83]

B:BD[9.72] → [8.8:83]

                && ((object >= DNGN_FLOOR_MIN && object <= DNGN_FLOOR_MAX)

[7.2189]

[8.83]

                && (object >= DNGN_FLOOR_MIN && object <= DNGN_FLOOR_MAX

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

[10.1092]

    // Colour closed shops grey.
    if (terrain_seen && grd(p) == DNGN_ENTER_SHOP && shop_is_closed(p))
        feature_colour = LIGHTGREY;

Insertion in crawl-ref/source/shopping.cc at line 34 [6.759950]
[11.166279]
[6.760578]
```
#include "overmap.h"
```

Insertion in crawl-ref/source/shopping.cc at line 1704 [6.759950]

[2.710]

[6.797921]


    // If the shop is now empty, erase it from the overmap.
    if ( _shop_get_stock(i).empty() )
        unnotice_feature(level_pos(level_id::current(), you.pos()));

Replacement in crawl-ref/source/overmap.cc at line 59 [6.1070017]

B:BD[6.1071123] → [12.7711:7773]

B:BD[12.7773] → [13.2149:2379]

static void seen_altar( god_type god, const coord_def& pos );
static void seen_staircase(dungeon_feature_type which_staircase,
                           const coord_def& pos);
static void seen_other_thing(dungeon_feature_type which_thing,
                             const coord_def& pos);

[6.1071123]

[6.1071325]

static void _seen_altar( god_type god, const coord_def& pos );
static void _seen_staircase(dungeon_feature_type which_staircase,
                            const coord_def& pos);
static void _seen_other_thing(dungeon_feature_type which_thing,
                              const coord_def& pos);

Replacement in crawl-ref/source/overmap.cc at line 77 [6.1070017]
B:BD[11.358767] → [12.8025:8057]
```
        seen_altar( god, pos );
```
[11.358767]
[11.358794]
```
        _seen_altar( god, pos );
```
Replacement in crawl-ref/source/overmap.cc at line 79 [6.1070017]
B:BD[11.358845] → [12.8058:8102]
```
        seen_staircase( which_thing, pos );
```
[11.358845]
[11.358884]
```
        _seen_staircase( which_thing, pos );
```
Replacement in crawl-ref/source/overmap.cc at line 81 [6.1070017]
B:BD[11.358893] → [12.8103:8149]
```
        seen_other_thing( which_thing, pos );
```
[11.358893]
[14.1799]
```
        _seen_other_thing( which_thing, pos );
```
Replacement in crawl-ref/source/overmap.cc at line 530 [6.1070017]
B:BD[13.2527] → [13.2527:2579]
```
inline static bool find_erase(Z &map, const Key &k)
```
[13.2527]
[15.126]
```
inline static bool _find_erase(Z &map, const Key &k)
```
Replacement in crawl-ref/source/overmap.cc at line 540 [6.1070017]
B:BD[13.2694] → [13.2694:2744]
```
static bool unnotice_portal(const level_pos &pos)
```
[13.2694]
[13.2744]
```
static bool _unnotice_portal(const level_pos &pos)
```
Replacement in crawl-ref/source/overmap.cc at line 542 [6.1070017]
B:BD[13.2746] → [13.2746:2791]
```
    return find_erase(portals_present, pos);
```
[13.2746]
[16.7050]
```
    return _find_erase(portals_present, pos);
```
Replacement in crawl-ref/source/overmap.cc at line 545 [6.1070017]
B:BD[16.7053] → [16.7053:7109]
```
static bool unnotice_portal_vault(const level_pos &pos)
```
[16.7053]
[16.7109]
```
static bool _unnotice_portal_vault(const level_pos &pos)
```

Replacement in crawl-ref/source/overmap.cc at line 547 [6.1070017]

B:BD[16.7111] → [16.7111:7161]

B:BD[16.7161] → [3.3665:3713]

∅:D[3.3713] → [16.7161:7212]

B:BD[16.7161] → [16.7161:7212]

    (void) find_erase(portal_vault_colours, pos);
    (void) find_erase(portal_vault_notes, pos);
    return find_erase(portal_vaults_present, pos);

[16.7111]

[13.2791]

    (void) _find_erase(portal_vault_colours, pos);
    (void) _find_erase(portal_vault_notes, pos);
    return _find_erase(portal_vaults_present, pos);

Replacement in crawl-ref/source/overmap.cc at line 552 [6.1070017]
B:BD[13.2794] → [13.2794:2843]
```
static bool unnotice_altar(const level_pos &pos)
```
[13.2794]
[13.2843]
```
static bool _unnotice_altar(const level_pos &pos)
```
Replacement in crawl-ref/source/overmap.cc at line 554 [6.1070017]
B:BD[13.2845] → [13.2845:2889]
```
    return find_erase(altars_present, pos);
```
[13.2845]
[13.2889]
```
    return _find_erase(altars_present, pos);
```
Replacement in crawl-ref/source/overmap.cc at line 557 [6.1070017]
B:BD[13.2892] → [13.2892:2940]
```
static bool unnotice_shop(const level_pos &pos)
```
[13.2892]
[13.2940]
```
static bool _unnotice_shop(const level_pos &pos)
```
Replacement in crawl-ref/source/overmap.cc at line 559 [6.1070017]
B:BD[13.2942] → [13.2942:2985]
```
    return find_erase(shops_present, pos);
```
[13.2942]
[13.2985]
```
    return _find_erase(shops_present, pos);
```
Replacement in crawl-ref/source/overmap.cc at line 562 [6.1070017]
B:BD[13.2988] → [13.2988:3037]
```
static bool unnotice_stair(const level_pos &pos)
```
[13.2988]
[13.3037]
```
static bool _unnotice_stair(const level_pos &pos)
```

Replacement in crawl-ref/source/overmap.cc at line 572 [6.1070017]

B:BD[13.3323] → [13.3323:3377]

                return (find_erase(stair_level, br));

[13.3323]

[13.3377]

                return (_find_erase(stair_level, br));

Replacement in crawl-ref/source/overmap.cc at line 581 [6.1070017]

B:BD[13.3476] → [13.3476:3509]

B:BD[13.3509] → [16.7213:7255]

∅:D[16.7255] → [13.3509:3615]

B:BD[13.3509] → [13.3509:3615]

    return (unnotice_portal(pos)
            || unnotice_portal_vault(pos)
            || unnotice_altar(pos)
            || unnotice_shop(pos)
            || unnotice_stair(pos));

[13.3476]

[17.181]

    return (_unnotice_portal(pos)
            || _unnotice_portal_vault(pos)
            || _unnotice_altar(pos)
            || _unnotice_shop(pos)
            || _unnotice_stair(pos));

Replacement in crawl-ref/source/overmap.cc at line 597 [6.1070017]

B:BD[6.1083315] → [13.3616:3719]

void seen_staircase( dungeon_feature_type which_staircase,
                     const coord_def& pos )

[6.1083315]

[6.1083368]

static void _seen_staircase( dungeon_feature_type which_staircase,
                             const coord_def& pos )

Replacement in crawl-ref/source/overmap.cc at line 607 [6.1070017]
B:BD[18.435] → [18.435:476]
```
    for ( i = 0; i < NUM_BRANCHES; ++i )
```
[18.435]
[6.1083716]
```
    for (i = 0; i < NUM_BRANCHES; ++i)
```

Replacement in crawl-ref/source/overmap.cc at line 609 [6.1070017]

B:BD[6.1083722] → [18.477:536]

        if ( branches[i].entry_stairs == which_staircase )

[6.1083722]

[18.536]

        if (branches[i].entry_stairs == which_staircase)

Replacement in crawl-ref/source/overmap.cc at line 618 [6.1070017]

B:BD[6.1084981] → [6.1084981:1085023]

B:BD[6.1085023] → [12.14480:14534]

// if player has seen an altar; record it
void seen_altar( god_type god, const coord_def& pos )

[6.1084980]

[6.1085068]

// If player has seen an altar; record it.
static void _seen_altar( god_type god, const coord_def& pos )

Replacement in crawl-ref/source/overmap.cc at line 621 [6.1070017]

B:BD[6.1085070] → [6.1085070:1085150]

    // can't record in abyss or pan.
    if ( you.level_type != LEVEL_DUNGEON )

[6.1085070]

[6.1085150]

    // Can't record in Abyss or Pan.
    if (you.level_type != LEVEL_DUNGEON)

Replacement in crawl-ref/source/overmap.cc at line 639 [6.1070017]
B:BD[6.1085728] → [12.14843:14863]
```
    switch ( feat )
```
[6.1085728]
[6.1085852]
```
    switch (feat)
```

Replacement in crawl-ref/source/overmap.cc at line 654 [6.1070017]

B:BD[6.1087069] → [12.15034:15083]

B:BD[12.15083] → [13.3720:3800]

// if player has seen any other thing; record it
void seen_other_thing( dungeon_feature_type which_thing, const coord_def& pos )

[6.1087069]

[6.1087202]

// If player has seen any other thing; record it.
void _seen_other_thing( dungeon_feature_type which_thing, const coord_def& pos )

Replacement in crawl-ref/source/overmap.cc at line 657 [6.1070017]

B:BD[6.1087204] → [12.15157:15233]

    if ( you.level_type != LEVEL_DUNGEON ) // can't record in abyss or pan.

[6.1087204]

[12.15233]

    if (you.level_type != LEVEL_DUNGEON) // Can't record in Abyss or Pan.

Replacement in crawl-ref/source/overmap.cc at line 662 [6.1070017]
B:BD[6.1087547] → [12.15311:15338]
```
    switch ( which_thing )
```
[6.1087547]
[6.1087572]
```
    switch (which_thing)
```

Replacement in crawl-ref/source/overmap.cc at line 665 [6.1070017]

B:BD[12.15365] → [12.15365:15396]

B:BD[12.15396] → [19.19037:19094]

        shops_present[where] =
            static_cast<shop_type>(get_shop(pos)->type);

[12.15365]

[12.15462]

        if (!shop_is_closed(pos))
            shops_present[where] = static_cast<shop_type>(get_shop(pos)->type);

Replacement in crawl-ref/source/overmap.cc at line 703 [6.1070017]
B:BD[6.1087641] → [12.15655:15692]
```
}          // end seen_other_thing()
```
[6.1087641]
[20.7603]
```
}
```

Erase closed shops from the overmap.

Dependencies

In channels

Change contents

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

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

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

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

Insertion in crawl-ref/source/shopping.cc at line 34 [6.759950]

Insertion in crawl-ref/source/shopping.cc at line 1704 [6.759950]

Replacement in crawl-ref/source/overmap.cc at line 59 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 77 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 79 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 81 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 530 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 540 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 542 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 545 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 547 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 552 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 554 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 557 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 559 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 562 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 572 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 581 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 597 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 607 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 609 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 618 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 621 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 639 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 654 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 657 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 662 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 665 [6.1070017]

Replacement in crawl-ref/source/overmap.cc at line 703 [6.1070017]