fiddlerwoaroof/crawl - Change BW6QCGQDWZ6G2UGDD4EXI5VVDZHM5S53MJIC5CKG3Q3VQ4IDQ2VQC

Discard more junk parameters from vault building routines.

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

Created by dshaligram on November 23, 2008

BW6QCGQDWZ6G2UGDD4EXI5VVDZHM5S53MJIC5CKG3Q3VQ4IDQ2VQC

Dependencies

In channels

main

Change contents

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

B:BD[4.472] → [5.1112:1191]

               bool check_place = false,
               bool clobber = false);

[4.472]

[6.2007625]

               bool check_place = false);

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

B:BD[4.602] → [5.1241:1297]

                       bool check_place, bool clobber);

[4.602]

[7.583800]

                       bool check_place);

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

B:BD[4.702] → [5.1298:1355]

                        bool check_place, bool clobber);

[4.702]

[6.2008882]

                        bool check_place);

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

B:BD[8.2846] → [8.2846:2910]

                bool check_place,
                bool clobber)

[8.2846]

[6.2015400]

                bool check_place)

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

B:BD[9.4618] → [5.1405:1514]

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

[9.4618]

[9.4619]

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

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

B:BD[4.946] → [5.1515:1570]

                       bool check_place, bool clobber)

[4.946]

[6.2142743]

                       bool check_place)

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

B:BD[10.2365] → [5.1571:1647]

                                              place, check_place, clobber);

[10.2365]

[4.1330]

                                              place, check_place);

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

B:BD[4.2635] → [5.2001:2062]

                             bool check_place, bool clobber)

[4.2635]

[6.2157728]

                             bool check_place)

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

B:BD[4.2709] → [3.4148:4216]

    if (check_place && !clobber && bad_map_place(def, start, size))

[4.2709]

[4.2770]

    if (check_place && bad_map_place(def, start, size))

Replacement in crawl-ref/source/maps.cc at line 293 [6.2007666]
B:BD[4.3003] → [5.2167:2215]
```
        bool check_place,
        bool clobber)
```
[4.3003]
[6.2177450]
```
        bool check_place)
```

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

B:BD[6.2177452] → [5.2216:2282]

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

[6.2177452]

[4.3100]

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

Replacement in crawl-ref/source/dungeon.h at line 313 [6.3428186]

B:BD[11.11792] → [12.2290:2355]

B:BD[12.2355] → [13.298:337]

bool dgn_place_map(int map, bool generating_level, bool clobber,
                   bool make_no_exits,

[11.11792]

[12.2355]

bool dgn_place_map(int map, bool clobber, bool make_no_exits,

Deletion in crawl-ref/source/dungeon.cc at line 199 [6.3429798]

B:BD[14.11255] → [14.11255:11320]

                                   bool generating_level = true,

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

B:BD[14.11654] → [14.11654:11790]

                          bool check_vault_place = false,
                          bool generating_level = true, bool clobber = false,

[14.11654]

[14.11790]

                          bool check_collisions = false,

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

B:BD[14.11980] → [14.11980:12059]

                              bool level_builder = true, bool clobber = false,

[14.11980]

[14.12059]

                              bool clobber = false,

Insertion in crawl-ref/source/dungeon.cc at line 242 [6.3429798]
[15.3170]
[16.6734]
```
bool Generating_Level = false;
```
Insertion in crawl-ref/source/dungeon.cc at line 290 [6.3429798]
[17.13065]
[18.1721]
```
    unwind_bool levelgen(Generating_Level, true);
```

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

B:BD[19.3417] → [14.19451:19522]

∅:D[14.19522] → [13.653:693]

B:BD[13.653] → [13.653:693]

        _build_minivaults( level_number, vaultidx, true, false, false,
                          centres[1] );

[19.3417]

[20.1032]

        _build_minivaults( level_number, vaultidx, false, false,
                           centres[1] );

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

∅:D[17.13504] → [14.19584:19659]

B:BD[21.7990] → [14.19584:19659]

            _build_minivaults( level_number, vaultidx, true, false, false,

[17.13504]

[14.19659]

            _build_minivaults( level_number, vaultidx, false, false,

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

B:BD[14.27853] → [14.27853:27992]

                              bool building_level, bool clobber,
                              bool make_no_exits, const coord_def &where)

[14.27853]

[6.3594088]

                              bool clobber, bool make_no_exits,
                              const coord_def &where)

Replacement in crawl-ref/source/dungeon.cc at line 3989 [6.3429798]
∅:D[3.6283] → [22.81660:81689]
B:BD[22.81660] → [22.81660:81689]
```
        if (!building_level)
```
[3.6283]
[6.3596999]
```
        if (!Generating_Level)
```

Deletion in crawl-ref/source/dungeon.cc at line 4398 [6.3429798]

∅:D[23.4264] → [24.352:539]

∅:D[17.14447] → [24.352:539]

B:BD[24.352] → [24.352:539]

// generating_level: If true, assumes that this is in the middle of normal
//                   level generation, and does not link items or handle
//                   changing terrain.

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

B:BD[24.709] → [12.5498:5563]

B:BD[12.5563] → [13.1132:1195]

bool dgn_place_map(int map, bool generating_level, bool clobber,
                   bool make_no_exits, const coord_def &where)

[24.709]

[5.6755]

bool dgn_place_map(int map, bool clobber, bool make_no_exits,
                   const coord_def &where)

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

B:BD[5.6829] → [23.4290:4350]

    if (mdef->orient == MAP_ENCOMPASS && !generating_level)

[5.6829]

[23.4350]

    if (mdef->orient == MAP_ENCOMPASS && !Generating_Level)

Replacement in crawl-ref/source/dungeon.cc at line 4415 [6.3429798]
B:BD[23.4446] → [23.4446:4483]
```
            generating_level = true;
```
[23.4446]
[23.4483]
```
            unwind_bool levgen(Generating_Level, true);
```

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

B:BD[21.14394] → [14.31545:31688]

        did_map = _build_minivaults(you.your_level, map, generating_level,
                                    clobber, make_no_exits, where);

[21.14394]

[21.14535]

        did_map = _build_minivaults(you.your_level, map, clobber,
                                    make_no_exits, where);

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

B:BD[14.31827] → [14.31827:31959]

                                         generating_level, clobber,
                                         make_no_exits, where);

[14.31827]

[5.7272]

                                         clobber, make_no_exits, where);

Replacement in crawl-ref/source/dungeon.cc at line 4445 [6.3429798]
B:BD[5.7323] → [2.285:323]
```
    if (did_map && !generating_level)
```
[5.7323]
[5.7340]
```
    if (did_map && !Generating_Level)
```
Replacement in crawl-ref/source/dungeon.cc at line 4470 [6.3429798]
B:BD[23.4987] → [23.4987:5023]
```
    if (fixup || !generating_level)
```
[23.4987]
[23.5023]
```
    if (fixup || !Generating_Level)
```

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

B:BD[14.32024] → [14.32024:32221]

                                   int rune_subst, bool generating_level,
                                   bool clobber, bool no_exits,
                                   const coord_def &where)

[14.32024]

[4.7977]

                                   int rune_subst, bool clobber,
                                   bool no_exits, const coord_def &where)

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

∅:D[25.7542] → [14.32222:32356]

B:BD[4.7979] → [14.32222:32356]

    if (_build_vaults(level_number, vault, rune_subst, true, true,
                      generating_level, clobber, no_exits, where))

[25.7542]

[4.8040]

    if (_build_vaults(level_number, vault, rune_subst, true, !clobber,
                      no_exits, where))

Deletion in crawl-ref/source/dungeon.cc at line 4496 [6.3429798]
B:BD[14.32529] → [14.32529:32592]
```
                          bool generating_level, bool clobber,
```

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

B:BD[5.8407] → [5.8407:8469]

                                  check_collisions, clobber);

[5.8407]

[26.4654]

                                  check_collisions);

Replacement in crawl-ref/source/dungeon.cc at line 4533 [6.3429798]
∅:D[3.6430] → [27.8585:8620]
B:BD[27.8585] → [27.8585:8620]
```
            if (!generating_level)
```
[3.6430]
[27.8620]
```
            if (!Generating_Level)
```

Replacement in crawl-ref/source/decks.cc at line 2318 [6.3987460]

B:BD[28.842] → [13.1711:1780]

                dgn_place_map(mapidx, false, true, true, you.pos());

[28.842]

[28.905]

                dgn_place_map(mapidx, true, true, you.pos());

Replacement in crawl-ref/source/debug.cc at line 3778 [6.4016436]
∅:D[29.12521] → [13.1783:1838]
B:BD[12.7590] → [13.1783:1838]
```
    if (dgn_place_map(map, false, true, false, where))
```
[29.12521]
[5.9560]
```
    if (dgn_place_map(map, true, false, where))
```