fiddlerwoaroof/crawl - Change OURSD5M5NJ5MIM6BCK5IYW4B447TWQKMD33HFWXW57ZZ7U4DMEKAC

Fix Zot random non-minivaults not being placeable. This change also allows random vault use on top of 'layout' maps.

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

Created by dshaligram on July 14, 2009

OURSD5M5NJ5MIM6BCK5IYW4B447TWQKMD33HFWXW57ZZ7U4DMEKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/dungeon.cc at line 822 [5.3429798]

B:BD[3.3172] → [4.14440:14493]

static bool _ensure_vault_placed(bool vault_success)

[3.3172]

[6.6690]

static bool _ensure_vault_placed(bool vault_success,
                                 bool disable_further_vaults)

Replacement in crawl-ref/source/dungeon.cc at line 827 [5.3429798]
B:BD[6.6749] → [7.865:874]
```
    else
```
[6.6749]
[8.13839]
```
    else if (disable_further_vaults)
```

Insertion in crawl-ref/source/dungeon.cc at line 832 [5.3429798]

[9.1939]

[4.14494]

static bool _ensure_vault_placed_ex( bool vault_success, const map_def *vault )
{
    return _ensure_vault_placed( vault_success,
                                 (!vault->has_tag("extra")
                                  && vault->orient == MAP_ENCOMPASS) );
}

Replacement in crawl-ref/source/dungeon.cc at line 2313 [5.3429798]

B:BD[10.961082] → [4.20350:20422]

            _ensure_vault_placed( _build_vaults(level_number, vault) );

[10.961082]

[5.3555091]

            _ensure_vault_placed( _build_vaults(level_number, vault), true );

Replacement in crawl-ref/source/dungeon.cc at line 2384 [5.3429798]

∅:D[11.5444] → [4.20770:20838]

B:BD[12.32237] → [4.20770:20838]

        _ensure_vault_placed( _build_vaults(level_number, vault) );

[11.5444]

[13.9355]

        _ensure_vault_placed( _build_vaults(level_number, vault), true );

Replacement in crawl-ref/source/dungeon.cc at line 2450 [5.3429798]

∅:D[2.4113] → [4.21344:21412]

B:BD[10.961873] → [4.21344:21412]

        _ensure_vault_placed( _build_vaults(level_number, vault) );

[2.4113]

[14.4267]

        _ensure_vault_placed_ex( _build_vaults(level_number, vault), vault );

Replacement in crawl-ref/source/dungeon.cc at line 2543 [5.3429798]

∅:D[2.4174] → [4.21972:22040]

B:BD[5.3559817] → [4.21972:22040]

        _ensure_vault_placed( _build_vaults(level_number, vault) );

[2.4174]

[14.4566]

        _ensure_vault_placed_ex( _build_vaults(level_number, vault), vault );

Replacement in crawl-ref/source/dungeon.cc at line 5937 [5.3429798]
B:BD[15.2954] → [15.2954:2989]
```
    _ensure_vault_placed(success);
```
[15.2954]
[5.3651379]
```
    _ensure_vault_placed(success, false);
```
Replacement in crawl-ref/source/dungeon.cc at line 5951 [5.3429798]
B:BD[16.3279] → [16.3279:3314]
```
    _ensure_vault_placed(success);
```
[16.3279]
[5.3651882]
```
    _ensure_vault_placed(success, false);
```
Replacement in crawl-ref/source/dungeon.cc at line 6185 [5.3429798]
B:BD[16.3501] → [16.3501:3536]
```
    _ensure_vault_placed(success);
```
[16.3501]
[5.3660455]
```
    _ensure_vault_placed(success, false);
```