fiddlerwoaroof/crawl - Change PISXY4NKSKL5KDJWAHD7CTXWTQDH3NFWQSFAHUAI3VVATWKXRODQC

Allow full-level (encompass) vaults to be placed outside the main dungeon.

Fixed a bug where secondary vaults and minivaults could overwrite special rooms.

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

Created by dshaligram on July 11, 2007

PISXY4NKSKL5KDJWAHD7CTXWTQDH3NFWQSFAHUAI3VVATWKXRODQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/maps.h at line 40 [6.2007036]

B:BD[5.472] → [5.472:539]

               std::vector<vault_placement> *avoid_vaults = NULL);

[5.472]

[6.2007625]

               bool check_place = false);

Replacement in crawl-ref/source/maps.cc at line 33 [6.2007666]

B:BD[5.602] → [5.602:658]

                       std::vector<vault_placement> *);

[5.602]

[7.583800]

                       bool check_place);

Replacement in crawl-ref/source/maps.cc at line 38 [6.2007666]

B:BD[5.702] → [5.702:759]

                        std::vector<vault_placement> *);

[5.702]

[6.2008882]

                        bool check_place);

Replacement in crawl-ref/source/maps.cc at line 61 [6.2007666]
B:BD[5.785] → [5.785:830]
```
        std::vector<vault_placement> *avoid)
```
[5.785]
[6.2015400]
```
        bool check_place)
```

Replacement in crawl-ref/source/maps.cc at line 83 [6.2007666]

B:BD[8.4618] → [9.213:282]

    return (write_vault( vdefs[which_vault], vgrid, place, avoid ));

[8.4618]

[8.4619]

    return (write_vault( vdefs[which_vault], vgrid, place, check_place ));

Replacement in crawl-ref/source/maps.cc at line 88 [6.2007666]

B:BD[5.946] → [5.946:1006]

                       std::vector<vault_placement> *avoid)

[5.946]

[6.2142743]

                       bool check_place)

Replacement in crawl-ref/source/maps.cc at line 107 [6.2007666]

B:BD[10.2365] → [10.2365:2426]

                                              place, avoid);

[10.2365]

[5.1330]

                                              place, check_place);

Replacement in crawl-ref/source/maps.cc at line 160 [6.2007666]

B:BD[2.439] → [2.439:502]

                          std::vector<vault_placement> *avoid)

[2.439]

[5.1428]

                          bool check_place)

Replacement in crawl-ref/source/maps.cc at line 162 [6.2007666]
B:BD[5.1430] → [2.503:519]
```
    if (!avoid)
```
[5.1430]
[2.519]
```
    if (!check_place)
```

Insertion in crawl-ref/source/maps.cc at line 175 [6.2007666]

[2.617]

[11.597]


            if (igrd[x][y] != NON_ITEM || mgrd[x][y] != NON_MONSTER)
                return (true);

Replacement in crawl-ref/source/maps.cc at line 199 [6.2007666]

B:BD[5.2635] → [5.2635:2701]

                             std::vector<vault_placement> *avoid)

[5.2635]

[6.2157728]

                             bool check_place)

Replacement in crawl-ref/source/maps.cc at line 238 [6.2007666]

B:BD[5.2709] → [11.843:909]

    if (bad_map_place(def, startx, starty, width, height, avoid))

[5.2709]

[5.2770]

    if (bad_map_place(def, startx, starty, width, height, check_place))

Replacement in crawl-ref/source/maps.cc at line 271 [6.2007666]
B:BD[5.3003] → [5.3003:3048]
```
        std::vector<vault_placement> *avoid)
```
[5.3003]
[6.2177450]
```
        bool check_place)
```

Replacement in crawl-ref/source/maps.cc at line 273 [6.2007666]

B:BD[6.2177452] → [5.3049:3100]

    if (!apply_vault_grid(def, map, place, avoid))

[6.2177452]

[5.3100]

    if (!apply_vault_grid(def, map, place, check_place))

Replacement in crawl-ref/source/dungeon.cc at line 193 [6.3429798]

B:BD[5.3550] → [5.3550:3683]

static bool build_vaults(int level_number, int vault_number, int rune_subst = -1,
                         bool build_only = false);

[5.3550]

[3.359]

static bool build_vaults(int level_number, int vault_number,
                         int rune_subst = -1, bool build_only = false,
                         bool check_vault_place = false);

Deletion in crawl-ref/source/dungeon.cc at line 1387 [6.3429798]
B:BD[7.962316] → [4.928:977]
```
        && player_in_branch(BRANCH_MAIN_DUNGEON)
```

Insertion in crawl-ref/source/dungeon.cc at line 1391 [6.3429798]

[12.3491]

[4.1024]


        // We'll accept any kind of primary vault in the main dungeon,
        // but only ORIENT: encompass primary vaults in other
        // branches. Other kinds of vaults can still be placed in
        // other branches as secondary vaults.
        // 
        if (vault != -1 && !player_in_branch(BRANCH_MAIN_DUNGEON)
            && map_by_index(vault)->orient != MAP_ENCOMPASS)
        {
            vault = -1;
        }

Replacement in crawl-ref/source/dungeon.cc at line 1723 [6.3429798]

B:BD[4.1151] → [4.1151:1219]

        const int vault = random_map_in_depth(level_id::current());

[4.1151]

[4.1219]

        int vault = random_map_in_depth(level_id::current());
        // ORIENT: encompass maps are unsuitable as secondary vaults.
        if (vault != -1 && map_by_index(vault)->orient == MAP_ENCOMPASS)
            vault = -1;

Replacement in crawl-ref/source/dungeon.cc at line 3213 [6.3429798]

B:BD[5.7979] → [5.7979:8040]

    if (build_vaults(level_number, vault, rune_subst, true))

[5.7979]

[5.8040]

    if (build_vaults(level_number, vault, rune_subst, true, true))

Replacement in crawl-ref/source/dungeon.cc at line 3224 [6.3429798]

B:BD[5.8279] → [5.8279:8321]

                         bool build_only)

[5.8279]

[6.3597423]

                         bool build_only, bool check_collisions)

Replacement in crawl-ref/source/dungeon.cc at line 3248 [6.3429798]

B:BD[6.3598736] → [5.8385:8462]

    const int gluggy = vault_main(vgrid, place, force_vault, &level_vaults);

[6.3598736]

[13.4654]

    const int gluggy = vault_main(vgrid, place, force_vault, check_collisions);

Replacement in crawl-ref/source/dungeon.cc at line 3294 [6.3429798]
B:BD[5.9013] → [5.9013:9045]
```
    // build, our work is done.
```
[5.9013]
[5.9045]
```
    // build the vault, our work is done.
```