fiddlerwoaroof/crawl - Change W5WCC5J7PL6IXZ5LPSUWGY3IVQBCTK3FKOD5ADYRWWH2N425NEAAC

Fixed bugs in floating vault exit connections, added an entry vault as a

testcase.

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

Created by dshaligram on July 7, 2007

W5WCC5J7PL6IXZ5LPSUWGY3IVQBCTK3FKOD5ADYRWWH2N425NEAAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 2791 [4.3429798]

[3.152296]


    // Handle exits in non-rectangular areas.
    if (!x_edge && !y_edge)
    {
        const coord_def rel = pos - coord_def(place.x, place.y);
        for (int yi = -1; yi <= 1; ++yi)
            for (int xi = -1; xi <= 1; ++xi)
            {
                if (!xi == !yi)
                    continue;
                const coord_def mv(rel.x + xi, rel.y + yi);
                if (!place.map.in_map(mv))
                    return (mv - rel);
            }
    }

Replacement in crawl-ref/source/dungeon.cc at line 2906 [4.3429798]

B:BD[2.4104] → [2.4104:4158]

            if (!place.map.in_map(coord_def(xi, yi)))

[2.4104]

[2.4158]

            if (!place.map.in_map(coord_def(xi - place.x, yi - place.y)))

Replacement in crawl-ref/source/dungeon.cc at line 2948 [4.3429798]

B:BD[3.153994] → [3.153994:154048]

    
    int nexits = possible_exits.size() / 10 + 1;

[3.153994]

[3.154048]


    const int npoints = possible_exits.size();
    int nexits = npoints < 6? npoints : npoints / 8 + 1;
    if (nexits > 10)
        nexits = 10;

Replacement in crawl-ref/source/dungeon.cc at line 3680 [4.3429798]
B:BD[5.9978] → [5.9978:9987]
∅:D[5.9987] → [3.156081:156111]
B:BD[4.3612401] → [3.156081:156111]
```
        
        grd(at) = DNGN_FLOOR;
```
[5.9978]
[4.3612401]
```
        if (unforbidden(at, MMT_VAULT))
            grd(at) = DNGN_FLOOR;
```

Insertion in crawl-ref/source/dat/entry.des at line 4021 [7.591]

[6.4187]

ENDMAP
##############################################################
# Miscellaneous entries
##############################################################
##############################################################
# Rooms in the neighbourhood.
NAME: misc_entry_001
TAGS: entry no_monster_gen
ORIENT: float
MAP
 xxxxx             xxxxx
xx...xx           xx...xx
x.....x           x.....x
x..(..+     V     +..[..x
x.....x           x.....x
xx...xx   xx+xx   xx...xx
 xxxxx   xx...xx   xxxxx
         x.....x
         x..{..x
         x.....x
         xx...xx
          xxxxx