fiddlerwoaroof/crawl - Change J7VTRSN2BLWL7QJMHG73LBUOUL6WNNT2ZAVEDMGYB6SDX3L5GGYQC

Actually replace sold out shops with the new feature DNGN_ABANDONED_SHOP.

This makes comparisons much easier and also avoids giving away information about far away shops being opened/closed. (This was only an issue if a shop only held blood potions that rotted away, but still.)

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

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

J7VTRSN2BLWL7QJMHG73LBUOUL6WNNT2ZAVEDMGYB6SDX3L5GGYQC

Dependencies

In channels

main

Change contents

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

B:BD[5.217] → [4.7:179]

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

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

B:BD[7.101] → [7.101:148]

                else if (fdef.colour != BLACK)

[5.323]

[5.365]

                if (fdef.colour != BLACK)

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

B:BD[8.1092] → [4.254:395]

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

Insertion in crawl-ref/source/view.cc at line 2816 [6.16817]
[9.15466]
[9.15466]
```
        case DNGN_ABANDONED_SHOP:
```
Replacement in crawl-ref/source/view.cc at line 3997 [6.16817]
B:BD[10.46160] → [11.715:757]
```
            Feature[i].minimap = MF_WALL;
```
[10.46160]
[10.46160]
```
            Feature[i].minimap      = MF_WALL;
```
Replacement in crawl-ref/source/view.cc at line 4004 [6.16817]
B:BD[10.46396] → [11.758:800]
```
            Feature[i].minimap = MF_WALL;
```
[10.46396]
[10.46396]
```
            Feature[i].minimap      = MF_WALL;
```

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

B:BD[12.1195] → [11.801:843]

            Feature[i].minimap = MF_WALL;

[12.1195]

[13.3214]

            Feature[i].minimap      = MF_WALL;

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

B:BD[10.46445] → [12.1196:1245]

∅:D[14.406] → [10.46516:46559]

∅:D[12.1245] → [10.46516:46559]

B:BD[10.46516] → [10.46516:46559]

            Feature[i].dchar  = DCHAR_DOOR_OPEN;
            Feature[i].colour = LIGHTGREY;

[10.46445]

[11.844]

            Feature[i].dchar   = DCHAR_DOOR_OPEN;
            Feature[i].colour  = LIGHTGREY;

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

B:BD[10.46610] → [12.1246:1297]

∅:D[14.457] → [10.46683:46726]

∅:D[12.1297] → [10.46683:46726]

B:BD[10.46683] → [10.46683:46726]

            Feature[i].dchar  = DCHAR_DOOR_CLOSED;
            Feature[i].colour = LIGHTGREY;

[10.46610]

[11.887]

            Feature[i].dchar   = DCHAR_DOOR_CLOSED;
            Feature[i].colour  = LIGHTGREY;

Replacement in crawl-ref/source/view.cc at line 4033 [6.16817]
B:BD[10.46958] → [11.930:972]
```
            Feature[i].minimap = MF_WALL;
```
[10.46958]
[10.46958]
```
            Feature[i].minimap      = MF_WALL;
```
Replacement in crawl-ref/source/view.cc at line 4041 [6.16817]
B:BD[10.47273] → [11.973:1015]
```
            Feature[i].minimap = MF_WALL;
```
[10.47273]
[10.47273]
```
            Feature[i].minimap      = MF_WALL;
```
Replacement in crawl-ref/source/view.cc at line 4048 [6.16817]
B:BD[10.47514] → [11.1016:1058]
```
            Feature[i].minimap = MF_WALL;
```
[10.47514]
[10.47514]
```
            Feature[i].minimap      = MF_WALL;
```

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

B:BD[10.47565] → [12.1667:1713]

B:BD[12.1713] → [15.7:88]

            Feature[i].dchar  = DCHAR_STATUE;
            Feature[i].colour = BROWN; // same as clay golem, I hope that's okay

[10.47565]

[11.1059]

            Feature[i].dchar   = DCHAR_STATUE;
            Feature[i].colour  = BROWN; // same as clay golem, I hope that's okay

Replacement in crawl-ref/source/view.cc at line 4061 [6.16817]
B:BD[10.47907] → [11.1102:1144]
```
            Feature[i].minimap = MF_WALL;
```
[10.47907]
[11.1144]
```
            Feature[i].minimap      = MF_WALL;
```

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

B:BD[10.48193] → [12.1873:1919]

∅:D[12.1919] → [16.112:154]

B:BD[14.725] → [16.112:154]

            Feature[i].dchar  = DCHAR_STATUE;
            Feature[i].colour = DARKGREY;

[10.48193]

[11.1164]

            Feature[i].dchar   = DCHAR_STATUE;
            Feature[i].colour  = DARKGREY;

Replacement in crawl-ref/source/view.cc at line 4071 [6.16817]
B:BD[10.48562] → [12.1920:1964]
∅:D[14.769] → [10.48628:48665]
∅:D[12.1964] → [10.48628:48665]
B:BD[10.48628] → [10.48628:48665]
```
            Feature[i].dchar  = DCHAR_WAVY;
            Feature[i].colour = RED;
```
[10.48562]
[11.1207]
```
            Feature[i].dchar   = DCHAR_WAVY;
            Feature[i].colour  = RED;
```
Replacement in crawl-ref/source/view.cc at line 4077 [6.16817]
B:BD[10.48715] → [12.1965:2009]
∅:D[14.813] → [10.48781:48819]
∅:D[12.2009] → [10.48781:48819]
B:BD[10.48781] → [10.48781:48819]
```
            Feature[i].dchar  = DCHAR_WAVY;
            Feature[i].colour = BLUE;
```
[10.48715]
[11.1250]
```
            Feature[i].dchar   = DCHAR_WAVY;
            Feature[i].colour  = BLUE;
```
Replacement in crawl-ref/source/view.cc at line 4083 [6.16817]
B:BD[10.48872] → [12.2010:2054]
∅:D[14.857] → [10.48938:48976]
∅:D[12.2054] → [10.48938:48976]
B:BD[10.48938] → [10.48938:48976]
```
            Feature[i].dchar  = DCHAR_WAVY;
            Feature[i].colour = CYAN;
```
[10.48872]
[11.1294]
```
            Feature[i].dchar   = DCHAR_WAVY;
            Feature[i].colour  = CYAN;
```

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

B:BD[17.85] → [11.1338:1381]

            Feature[i].minimap = MF_FLOOR;

[17.85]

            Feature[i].minimap      = MF_FLOOR;

Replacement in crawl-ref/source/view.cc at line 4099 [6.16817]
B:BD[10.49209] → [11.1382:1425]
```
            Feature[i].minimap = MF_FLOOR;
```
[10.49209]
[10.49209]
```
            Feature[i].minimap      = MF_FLOOR;
```

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

B:BD[10.49500] → [11.1426:1472]

            Feature[i].minimap = MF_STAIR_UP;

[10.49500]

            Feature[i].minimap     = MF_STAIR_UP;

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

B:BD[10.49781] → [11.1473:1523]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.49781]

            Feature[i].minimap     = MF_STAIR_BRANCH;

Replacement in crawl-ref/source/view.cc at line 4123 [6.16817]
B:BD[10.49992] → [11.1524:1566]
```
            Feature[i].minimap = MF_TRAP;
```
[10.49992]
[10.49992]
```
            Feature[i].minimap    = MF_TRAP;
```
Replacement in crawl-ref/source/view.cc at line 4130 [6.16817]
B:BD[10.50196] → [11.1567:1609]
```
            Feature[i].minimap = MF_TRAP;
```
[10.50196]
[10.50196]
```
            Feature[i].minimap    = MF_TRAP;
```
Replacement in crawl-ref/source/view.cc at line 4137 [6.16817]
B:BD[18.155] → [11.1610:1652]
```
            Feature[i].minimap = MF_TRAP;
```
[18.155]
[10.50400]
```
            Feature[i].minimap    = MF_TRAP;
```
Replacement in crawl-ref/source/view.cc at line 4144 [6.16817]
B:BD[10.50645] → [11.1653:1696]
```
            Feature[i].minimap = MF_FLOOR;
```
[10.50645]
[10.50645]
```
            Feature[i].minimap      = MF_FLOOR;
```

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

B:BD[10.50932] → [11.1697:1742]

            Feature[i].minimap = MF_FEATURE;

[10.50932]

            Feature[i].minimap     = MF_FEATURE;
            break;
        case DNGN_ABANDONED_SHOP:
            Feature[i].colour     = LIGHTGREY;
            Feature[i].dchar      = DCHAR_ARCH;
            Feature[i].map_colour = LIGHTGREY;
            Feature[i].minimap    = MF_FLOOR;

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

B:BD[10.51220] → [11.1743:1793]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.51220]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[19.542] → [11.1794:1844]

            Feature[i].minimap = MF_STAIR_BRANCH;

[19.542]

[20.835]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[21.160] → [11.1845:1893]

            Feature[i].minimap = MF_STAIR_DOWN;

[21.160]

            Feature[i].minimap    = MF_STAIR_DOWN;

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

B:BD[8.1870] → [11.1894:1945]

            Feature[i].minimap    = MF_STAIR_DOWN;

[8.1870]

[10.51657]

            Feature[i].minimap        = MF_STAIR_DOWN;

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

B:BD[21.390] → [11.1946:1992]

            Feature[i].minimap = MF_STAIR_UP;

[21.390]

            Feature[i].minimap    = MF_STAIR_UP;

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

B:BD[8.1965] → [11.1993:2039]

            Feature[i].minimap = MF_STAIR_UP;

[8.1965]

[10.52082]

            Feature[i].minimap        = MF_STAIR_UP;

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

B:BD[10.52364] → [11.2040:2090]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.52364]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.52648] → [11.2091:2141]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.52648]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.52944] → [11.2142:2192]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.52944]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.53239] → [11.2193:2243]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.53239]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.53533] → [11.2244:2294]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.53533]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.53739] → [11.2295:2345]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.53739]

            Feature[i].minimap    = MF_STAIR_BRANCH;

Replacement in crawl-ref/source/view.cc at line 4276 [6.16817]
B:BD[10.53945] → [11.2346:2389]
```
            Feature[i].minimap = MF_FLOOR;
```
[10.53945]
[10.53945]
```
            Feature[i].minimap    = MF_FLOOR;
```

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

B:BD[10.54245] → [11.2390:2440]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.54245]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.54575] → [11.2441:2491]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.54575]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.54840] → [11.2492:2542]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.54840]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[22.51] → [11.2543:2593]

            Feature[i].minimap = MF_STAIR_BRANCH;

[22.51]

[10.55646]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.55934] → [11.2594:2644]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.55934]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[22.141] → [11.2645:2695]

            Feature[i].minimap = MF_STAIR_BRANCH;

[22.141]

[10.56777]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.57032] → [11.2696:2746]

            Feature[i].minimap = MF_STAIR_BRANCH;

[10.57032]

            Feature[i].minimap     = MF_STAIR_BRANCH;

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

B:BD[10.57316] → [11.2747:2792]

            Feature[i].minimap = MF_FEATURE;

[10.57316]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.57610] → [11.2793:2838]

            Feature[i].minimap = MF_FEATURE;

[10.57610]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.57910] → [11.2839:2884]

            Feature[i].minimap = MF_FEATURE;

[10.57910]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.58210] → [11.2885:2930]

            Feature[i].minimap = MF_FEATURE;

[10.58210]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.58502] → [11.2931:2976]

            Feature[i].minimap = MF_FEATURE;

[10.58502]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.58800] → [11.2977:3022]

            Feature[i].minimap = MF_FEATURE;

[10.58800]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.59086] → [11.3023:3068]

            Feature[i].minimap = MF_FEATURE;

[10.59086]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.59378] → [11.3069:3114]

            Feature[i].minimap = MF_FEATURE;

[10.59378]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.59665] → [11.3115:3160]

            Feature[i].minimap = MF_FEATURE;

[10.59665]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.59946] → [11.3161:3206]

            Feature[i].minimap = MF_FEATURE;

[10.59946]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.60254] → [11.3207:3252]

            Feature[i].minimap = MF_FEATURE;

[10.60254]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[10.60551] → [11.3253:3298]

            Feature[i].minimap = MF_FEATURE;

[10.60551]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[23.301] → [11.3299:3344]

            Feature[i].minimap = MF_FEATURE;

[23.301]

            Feature[i].minimap     = MF_FEATURE;

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

B:BD[24.96] → [11.3345:3390]

            Feature[i].minimap = MF_FEATURE;

[24.96]

[25.4918]

            Feature[i].minimap     = MF_FEATURE;

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

∅:D[26.41] → [10.60604:60642]

B:BD[10.60604] → [10.60604:60642]

B:BD[10.60642] → [26.42:90]

            Feature[i].colour = BLUE;
            Feature[i].dchar  = DCHAR_FOUNTAIN;

[26.41]

[11.3391]

            Feature[i].colour  = BLUE;
            Feature[i].dchar   = DCHAR_FOUNTAIN;

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

∅:D[26.129] → [10.60770:60813]

B:BD[10.60770] → [10.60770:60813]

B:BD[10.60813] → [26.130:178]

            Feature[i].colour = LIGHTBLUE;
            Feature[i].dchar  = DCHAR_FOUNTAIN;

[26.129]

[11.3437]

            Feature[i].colour  = LIGHTBLUE;
            Feature[i].dchar   = DCHAR_FOUNTAIN;

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

B:BD[26.213] → [26.213:298]

            Feature[i].colour = RED;
            Feature[i].dchar  = DCHAR_FOUNTAIN;

[26.213]

[11.3483]

            Feature[i].colour  = RED;
            Feature[i].dchar   = DCHAR_FOUNTAIN;

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

B:BD[10.61009] → [10.61009:61052]

B:BD[10.61052] → [12.8775:8823]

            Feature[i].colour = LIGHTGREY;
            Feature[i].dchar  = DCHAR_FOUNTAIN;

[10.61009]

[11.3529]

            Feature[i].colour  = LIGHTGREY;
            Feature[i].dchar   = DCHAR_FOUNTAIN;

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

B:BD[10.61175] → [14.2962:3014]

            Feature[i].dchar = DCHAR_INVIS_EXPOSED;

[10.61175]

[11.3575]

            Feature[i].dchar   = DCHAR_INVIS_EXPOSED;

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

B:BD[10.61303] → [27.7:59]

            Feature[i].dchar = DCHAR_ITEM_DETECTED;

[10.61303]

[11.3626]

            Feature[i].dchar   = DCHAR_ITEM_DETECTED;

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

B:BD[10.61432] → [14.3015:3062]

            Feature[i].dchar = DCHAR_ITEM_ORB;

[10.61432]

[11.3669]

            Feature[i].dchar   = DCHAR_ITEM_ORB;

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

B:BD[10.61553] → [14.3063:3113]

            Feature[i].dchar = DCHAR_ITEM_WEAPON;

[10.61553]

[11.3712]

            Feature[i].dchar   = DCHAR_ITEM_WEAPON;

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

B:BD[10.61677] → [14.3114:3164]

            Feature[i].dchar = DCHAR_ITEM_ARMOUR;

[10.61677]

[11.3755]

            Feature[i].dchar   = DCHAR_ITEM_ARMOUR;

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

B:BD[10.61799] → [14.3165:3213]

            Feature[i].dchar = DCHAR_ITEM_WAND;

[10.61799]

[11.3798]

            Feature[i].dchar   = DCHAR_ITEM_WAND;

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

B:BD[10.61919] → [14.3214:3262]

            Feature[i].dchar = DCHAR_ITEM_FOOD;

[10.61919]

[11.3841]

            Feature[i].dchar   = DCHAR_ITEM_FOOD;

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

B:BD[10.62041] → [14.3263:3313]

            Feature[i].dchar = DCHAR_ITEM_SCROLL;

[10.62041]

[11.3884]

            Feature[i].dchar   = DCHAR_ITEM_SCROLL;

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

B:BD[10.62163] → [14.3314:3362]

            Feature[i].dchar = DCHAR_ITEM_RING;

[10.62163]

[11.3927]

            Feature[i].dchar   = DCHAR_ITEM_RING;

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

B:BD[10.62285] → [14.3363:3413]

            Feature[i].dchar = DCHAR_ITEM_POTION;

[10.62285]

[11.3970]

            Feature[i].dchar   = DCHAR_ITEM_POTION;

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

B:BD[10.62410] → [14.3414:3465]

            Feature[i].dchar = DCHAR_ITEM_MISSILE;

[10.62410]

[11.4013]

            Feature[i].dchar   = DCHAR_ITEM_MISSILE;

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

B:BD[10.62533] → [14.3466:3514]

            Feature[i].dchar = DCHAR_ITEM_BOOK;

[10.62533]

[11.4056]

            Feature[i].dchar   = DCHAR_ITEM_BOOK;

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

B:BD[10.62654] → [14.3515:3564]

            Feature[i].dchar = DCHAR_ITEM_STAVE;

[10.62654]

[11.4099]

            Feature[i].dchar   = DCHAR_ITEM_STAVE;

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

B:BD[10.62781] → [14.3565:3619]

            Feature[i].dchar = DCHAR_ITEM_MISCELLANY;

[10.62781]

[11.4142]

            Feature[i].dchar   = DCHAR_ITEM_MISCELLANY;

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

B:BD[10.62909] → [14.3620:3670]

            Feature[i].dchar = DCHAR_ITEM_CORPSE;

[10.62909]

[11.4185]

            Feature[i].dchar   = DCHAR_ITEM_CORPSE;

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

B:BD[10.63031] → [14.3671:3719]

            Feature[i].dchar = DCHAR_ITEM_GOLD;

[10.63031]

[11.4228]

            Feature[i].dchar   = DCHAR_ITEM_GOLD;

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

B:BD[10.63153] → [14.3720:3770]

            Feature[i].dchar = DCHAR_ITEM_AMULET;

[10.63153]

[11.4271]

            Feature[i].dchar   = DCHAR_ITEM_AMULET;

Replacement in crawl-ref/source/view.cc at line 4608 [6.16817]
B:BD[10.63271] → [14.3771:3815]
```
            Feature[i].dchar = DCHAR_CLOUD;
```
[10.63271]
[11.4314]
```
            Feature[i].dchar   = DCHAR_CLOUD;
```
Deletion in crawl-ref/source/tilepick.cc at line 2248 [29.96318]
B:BD[28.308] → [3.265:330]
```
    if (shop_is_closed(where))
        return TILE_SHOP_CLOSED;
```

Insertion in crawl-ref/source/tilepick.cc at line 2349 [29.96318]

[28.1445]

[30.1682]

    case DNGN_ABANDONED_SHOP:
        return TILE_DNGN_ABANDONED_SHOP;

Replacement in crawl-ref/source/stash.cc at line 121 [9.147324]

∅:D[31.4822] → [9.149850:149899]

B:BD[9.149850] → [9.149850:149899]

                       + s->description() + "]";

[31.4822]

[32.138]

                               + s->description() + "]";

Replacement in crawl-ref/source/stash.cc at line 127 [9.147324]
B:BD[9.149949] → [9.149949:149997]
```
static void fully_identify_item(item_def *item)
```
[9.149949]
[9.149997]
```
static void _fully_identify_item(item_def *item)
```
Insertion in crawl-ref/source/stash.cc at line 257 [9.147324]
[33.994]
[34.2577]
```
    case DNGN_ABANDONED_SHOP:
```
Replacement in crawl-ref/source/stash.cc at line 657 [9.147324]
B:BD[9.160040] → [9.160040:160080]
```
            fully_identify_item(&item);
```
[9.160040]
[9.160080]
```
            _fully_identify_item(&item);
```

Replacement in crawl-ref/source/stash.cc at line 965 [9.147324]

B:BD[9.167770] → [9.167770:167819]

                fully_identify_item(&item.item);

[9.167770]

[9.167819]

                _fully_identify_item(&item.item);

Replacement in crawl-ref/source/stash.cc at line 1190 [9.147324]

B:BD[9.172691] → [9.172691:172752]

        std::vector<stash_search_result> &results)
    const

[9.172691]

[9.172752]

        std::vector<stash_search_result> &results) const

Deletion in crawl-ref/source/stash.cc at line 1441 [9.147324]
∅:D[34.3923] → [9.178831:178837]
B:BD[9.178831] → [9.178831:178837]
```
    {
```
Deletion in crawl-ref/source/stash.cc at line 1460 [9.147324]
B:BD[9.179513] → [9.179513:179519]
```
    }
```
Deletion in crawl-ref/source/shopping.h at line 21 [6.758673]
B:BD[35.1429] → [3.758:803]
```
bool shop_is_closed(const coord_def &where);
```

Replacement in crawl-ref/source/shopping.cc at line 1671 [6.759950]

B:BD[36.92] → [3.805:892]

// Returns true if a shop is out of stock.
bool shop_is_closed(const coord_def &where)

[36.92]

[3.892]

static void _delete_shop(int i)

Replacement in crawl-ref/source/shopping.cc at line 1673 [6.759950]

B:BD[3.894] → [3.894:1040]

    for (int i = 0; i < MAX_SHOPS; i++)
        if (env.shop[i].pos == where)
            return _shop_get_stock(i).empty();
    return (false);

[3.894]

[3.1040]

    grd(you.pos()) = DNGN_ABANDONED_SHOP;
//    env.shop.erase(i);
    unnotice_feature(level_pos(level_id::current(), you.pos()));

Insertion in crawl-ref/source/shopping.cc at line 1697 [6.759950]
[37.36569]
[38.998]
```
        _delete_shop(i);
```
Insertion in crawl-ref/source/shopping.cc at line 1702 [6.759950]
[39.710]
[4.694]
```
    const std::string shopname = shop_name(env.shop[i].pos);
```

Replacement in crawl-ref/source/shopping.cc at line 1706 [6.759950]

B:BD[4.793] → [4.793:862]

        unnotice_feature(level_pos(level_id::current(), you.pos()));

[4.793]

[4.862]

        _delete_shop(i);

Replacement in crawl-ref/source/shopping.cc at line 1712 [6.759950]

B:BD[39.738] → [39.738:821]

        mprf("Thank you for shopping at %s!", shop_name(env.shop[i].pos).c_str());

[39.738]

[39.821]

        mprf("Thank you for shopping at %s!", shopname.c_str());

Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 381 [29.4169495]
B:BD[28.3717] → [3.3785:3820]
```
dngn_enter_shop_closed SHOP_CLOSED
```
[28.3717]
[3.3820]
```
dngn_abandoned_shop ABANDONED_SHOP
```
File move: dngn_enter_shop_closed.png → dngn_abandoned_shop.png
BF:BFD[28.3826] → [3.5595:5652]
BF:BF[3.5652] → [3.3952:3952]
[28.3826]
[3.3952]

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

B:BD[40.529] → [40.529:600]

    // there are at most 5 shops per level, plus 7 chars for the level

[40.529]

[40.600]

    // There are at most 5 shops per level, plus 7 chars for the level

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

B:BD[41.15365] → [4.5023:5137]

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

[41.15365]

[41.15462]

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

Replacement in crawl-ref/source/overmap.cc at line 698 [6.1070017]
B:BD[41.15557] → [41.15557:15594]
```
        if ( portal != PORTAL_NONE )
```
[41.15557]
[41.15594]
```
        if (portal != PORTAL_NONE)
```

Insertion in crawl-ref/source/misc.cc at line 1686 [6.1933596]

[42.516]

        else if (stair_find == DNGN_ABANDONED_SHOP)
            mpr("This shop appears to be closed.");

Replacement in crawl-ref/source/luadgn.cc at line 1250 [43.1232]

B:BD[26.6445] → [26.6445:6517]

    "dry_fountain_sparkling", "dry_fountain_blood", "permadry_fountain"

[26.6445]

[44.14343]

    "dry_fountain_sparkling", "dry_fountain_blood", "permadry_fountain",
    "abandoned_shop"

Replacement in crawl-ref/source/enum.h at line 897 [6.3287960]
B:BD[19.29780] → [19.29780:29831]
```
//   they return sane values for your new feature.
```
[19.29780]
[13.12215]
```
//        they return sane values for your new feature.
```
Insertion in crawl-ref/source/enum.h at line 1075 [6.3287960]
[26.8011]
[19.30027]
```
    DNGN_ABANDONED_SHOP,
```

Replacement in crawl-ref/source/directn.cc at line 1576 [6.3697945]

B:BD[45.5462] → [45.5462:5632]

            desc = feature_description(gc, false, DESC_PLAIN, false);
            if (!see_grid(gc))
            {
                desc = "[" + desc + "]";
            }

[45.5462]

[45.5632]

            desc = "[" + feature_description(gc, false, DESC_PLAIN, false)
                       + "]";

Replacement in crawl-ref/source/directn.cc at line 2193 [6.3697945]
∅:D[46.49764] → [47.4916:4952]
B:BD[48.2716] → [47.4916:4952]
```
    if ( grid == DNGN_SECRET_DOOR )
```
[46.49764]
[46.49765]
```
    if (grid == DNGN_SECRET_DOOR)
```
Replacement in crawl-ref/source/directn.cc at line 2196 [6.3697945]
∅:D[47.5013] → [48.2716:2766]
∅:D[49.8302] → [48.2716:2766]
B:BD[48.2716] → [48.2716:2766]
```
    std::string desc = feature_description(grid);
```
[49.8302]
[9.466321]
```
    std::string desc;
    desc = feature_description(grid);
```
Insertion in crawl-ref/source/directn.cc at line 2431 [6.3697945]
[19.37879]
[9.469748]
```
    case DNGN_ABANDONED_SHOP:
        return ("abandoned shop");
```
Replacement in crawl-ref/source/directn.cc at line 2579 [6.3697945]
∅:D[46.50002] → [50.529:565]
B:BD[50.529] → [50.529:565]
```
    if ( grid == DNGN_SECRET_DOOR )
```
[46.50002]
[46.50003]
```
    if (grid == DNGN_SECRET_DOOR)
```

Replacement in crawl-ref/source/directn.cc at line 2582 [6.3697945]

B:BD[50.618] → [47.5014:5076]

    if ( grid == DNGN_OPEN_DOOR || grid == DNGN_CLOSED_DOOR )

[50.618]

[47.5076]

    if (grid == DNGN_OPEN_DOOR || grid == DNGN_CLOSED_DOOR)

Insertion in crawl-ref/source/directn.cc at line 2606 [6.3697945]

[19.40897]

[10.982279]

    case DNGN_ABANDONED_SHOP:
        return thing_do_grammar(dtype, add_stop, false, "An abandoned shop");

Deletion in crawl-ref/source/directn.cc at line 2610 [6.3697945]

B:BD[10.982305] → [7.3089:3288]

    {
        std::string desc = "";
        if (shop_is_closed(where))
        {
            desc = "An abandoned shop";
            return thing_do_grammar(dtype, add_stop, false, desc);
        }

Replacement in crawl-ref/source/directn.cc at line 2611 [6.3697945]
B:BD[7.3331] → [7.3331:3337]
```
    }
```
[7.3331]
[51.8904]
Insertion in crawl-ref/source/dat/descript/features.txt at line 274 [52.62794]
[52.67935]
[52.67936]
```
%%%%
An abandoned shop
```
Replacement in crawl-ref/source/acr.cc at line 574 [6.4397395]
B:BD[53.16881] → [53.16881:16905]
```
        char name[80]; 
```
[53.16881]
[53.16905]
```
        char name[80];
```
Replacement in crawl-ref/source/acr.cc at line 581 [6.4397395]
B:BD[53.17154] → [53.17154:17169]
```
            { 
```
[53.17154]
[53.17169]
```
            {
```
Replacement in crawl-ref/source/acr.cc at line 594 [6.4397395]
B:BD[2.17453] → [2.17453:17464]
```
        } 
```
[2.17453]
[2.17464]
```
        }
```

Insertion in crawl-ref/source/acr.cc at line 1757 [6.4397395]

[54.1258]

        else if (ygrd == DNGN_ABANDONED_SHOP)
            mpr("This shop appears to be closed.");