fiddlerwoaroof/crawl - Change VTJOYDSSNQZOK23N65C64NUGDTGPL6QZWGCALRQHQDQXAPYBRKMAC

Use map_def* instead of map indices.

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

Created by dshaligram on November 23, 2008

VTJOYDSSNQZOK23N65C64NUGDTGPL6QZWGCALRQHQDQXAPYBRKMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/maps.h at line 21 [4.2007036]
∅:D[2.2612] → [3.440:472]
B:BD[3.440] → [3.440:472]
```
               int vault_force,
```
[2.2612]
[5.2514]
```
               const map_def *vault,
```

Replacement in crawl-ref/source/maps.h at line 30 [4.2007036]

B:BD[6.580] → [7.1192:1239]

∅:D[6.580] → [8.1771:1914]

∅:D[7.1239] → [8.1771:1914]

B:BD[9.176] → [8.1771:1914]

∅:D[8.1914] → [10.577:695]

∅:D[11.3017] → [10.577:695]

B:BD[12.583334] → [10.577:695]

int find_map_by_name(const std::string &name);
int random_map_for_place(const level_id &place, bool mini = false);
int random_map_in_depth(const level_id &lid, bool want_minivault = false);
int random_map_for_tag(const std::string &tag, bool want_minivault,
                       bool check_depth = false);

[6.580]

[12.583382]


const map_def *find_map_by_name(const std::string &name);
const map_def *random_map_for_place(const level_id &place, bool mini = false);
const map_def *random_map_in_depth(const level_id &lid,
                                   bool want_minivault = false);
const map_def *random_map_for_tag(const std::string &tag, bool want_minivault,
                                  bool check_depth = false);

Replacement in crawl-ref/source/maps.cc at line 41 [4.2007666]
B:BD[4.2008883] → [13.1912:1976]
```
static bool resolve_map(map_def &def, const map_def &original);
```
[4.2008883]
[4.2008883]
```
static bool resolve_map(map_def &def);
```
Replacement in crawl-ref/source/maps.cc at line 60 [4.2007666]
∅:D[2.2693] → [14.2813:2846]
B:BD[14.2813] → [14.2813:2846]
```
                int which_vault,
```
[2.2693]
[5.2645]
```
                const map_def *vault,
```

Replacement in crawl-ref/source/maps.cc at line 65 [4.2007666]

∅:D[15.12435] → [16.559:637]

B:BD[16.559] → [16.559:637]

         vdefs[which_vault].name.c_str(),
         place.pos.x, place.pos.y);

[15.12435]

[14.2911]

         vault->name.c_str(), place.pos.x, place.pos.y);

Replacement in crawl-ref/source/maps.cc at line 68 [4.2007666]
B:BD[17.247] → [17.247:298]
```
        mapgen_report_map_try(vdefs[which_vault]);
```
[17.247]
[12.584504]
```
        mapgen_report_map_try(*vault);
```

Replacement in crawl-ref/source/maps.cc at line 74 [4.2007666]

B:BD[18.4618] → [2.2694:2762]

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

[18.4618]

[18.4619]


    return (write_vault( const_cast<map_def&>(*vault), place, check_place ));

Replacement in crawl-ref/source/maps.cc at line 95 [4.2007666]
B:BD[13.2237] → [13.2237:2280]
```
        if (!resolve_map(place.map, mdef))
```
[13.2237]
[13.2280]
```
        if (!resolve_map(place.map))
```
Replacement in crawl-ref/source/maps.cc at line 108 [4.2007666]
B:BD[12.585216] → [13.2491:2554]
```
static bool resolve_map(map_def &map, const map_def &original)
```
[12.585216]
[4.2145663]
```
static bool resolve_map(map_def &map)
```
Replacement in crawl-ref/source/maps.cc at line 312 [4.2007666]
∅:D[19.2797] → [7.2286:2332]
B:BD[7.2286] → [7.2286:2332]
```
int find_map_by_name(const std::string &name)
```
[19.2797]
[7.2332]
```
const map_def *find_map_by_name(const std::string &name)
```
Replacement in crawl-ref/source/maps.cc at line 316 [4.2007666]
B:BD[7.2430] → [7.2430:2454]
```
            return (i);
```
[7.2430]
[20.24295]
```
            return (&vdefs[i]);
```
Replacement in crawl-ref/source/maps.cc at line 318 [4.2007666]
∅:D[20.24296] → [7.2454:2471]
B:BD[7.2454] → [7.2454:2471]
```
    return (-1);
```
[20.24296]
[21.3271]
```
    return (NULL);
```

Replacement in crawl-ref/source/maps.cc at line 476 [4.2007666]

B:BD[22.2851] → [22.2851:3030]

static int _random_map_by_selector(const map_selector &sel);
static int _random_map_in_list(const map_selector &sel,
                               const vault_indices &filtered)

[22.2851]

[22.3030]

static const map_def *_random_map_by_selector(const map_selector &sel);
static const map_def *_random_map_in_list(const map_selector &sel,
                                          const vault_indices &filtered)

Replacement in crawl-ref/source/maps.cc at line 565 [4.2007666]
B:BD[4.2199036] → [12.590434:590457]
```
    return (mapindex);
```
[4.2199036]
[23.10272]
```
    return (mapindex == -1? NULL : &vdefs[mapindex]);
```

Replacement in crawl-ref/source/maps.cc at line 568 [4.2007666]

B:BD[23.10275] → [22.3872:3932]

static int _random_map_by_selector(const map_selector &sel)

[23.10275]

[22.3932]

static const map_def *_random_map_by_selector(const map_selector &sel)

Replacement in crawl-ref/source/maps.cc at line 575 [4.2007666]

B:BD[23.10334] → [23.10334:10403]

int random_map_for_place(const level_id &place, bool want_minivault)

[23.10334]

[23.10403]

const map_def *random_map_for_place(const level_id &place, bool want_minivault)

Replacement in crawl-ref/source/maps.cc at line 581 [4.2007666]

B:BD[23.10500] → [23.10500:10568]

int random_map_in_depth(const level_id &place, bool want_minivault)

[23.10500]

[23.10568]

const map_def *random_map_in_depth(const level_id &place, bool want_minivault)

Replacement in crawl-ref/source/maps.cc at line 587 [4.2007666]

B:BD[23.10665] → [23.10665:10797]

int random_map_for_tag(const std::string &tag,
                       bool want_minivault,
                       bool check_depth)

[23.10665]

[23.10797]

const map_def *random_map_for_tag(const std::string &tag,
                                  bool want_minivault,
                                  bool check_depth)

Deletion in crawl-ref/source/maps.cc at line 593 [4.2007666]
∅:D[23.10900] → [9.178:295]
B:BD[12.590457] → [9.178:295]
B:BD[9.295] → [15.12678:12679]
∅:D[15.12679] → [9.300:326]
B:BD[9.300] → [9.300:326]
```
}
const map_def *map_by_index(int index)
{
    if (index < 0 || index >= (int) vdefs.size())
        return (NULL);
    return &vdefs[index];
```
Insertion in crawl-ref/source/maps.cc at line 863 [4.2007666]
[24.330]
[24.330]
```
const map_def *map_by_index(int index)
{
    return (&vdefs[index]);
}
```

Replacement in crawl-ref/source/maps.cc at line 896 [4.2007666]

B:BD[24.809] → [22.4235:4293]

∅:D[22.4293] → [23.11307:11328]

B:BD[23.11307] → [23.11307:11328]

        const int v = _random_map_in_list(sel, filtered);
        if (v == -1)

[24.809]

[23.11328]

        const map_def *map(_random_map_in_list(sel, filtered));
        if (!map)

Replacement in crawl-ref/source/maps.cc at line 900 [4.2007666]
B:BD[23.11377] → [23.11377:11418]
```
            map_counts[vdefs[v].name]++;
```
[23.11377]
[23.11418]
```
            map_counts[map->name]++;
```

Replacement in crawl-ref/source/dungeon.h at line 340 [4.3428186]

B:BD[25.11792] → [5.3122:3184]

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

[25.11792]

[16.2355]

bool dgn_place_map(const map_def *map, bool clobber, bool make_no_exits,

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

B:BD[4.3435268] → [26.11135:11199]

static bool _build_secondary_vault(int level_number, int vault,

[4.3435268]

[26.11199]

static bool _build_secondary_vault(int level_number, const map_def *vault,

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

B:BD[26.11520] → [26.11520:11582]

static bool _build_vaults(int level_number, int vault_number,

[26.11520]

[26.11582]

static bool _build_vaults(int level_number,
                          const map_def *vault,

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

B:BD[26.11915] → [26.11915:11980]

static bool _build_minivaults(int level_number, int force_vault,

[26.11915]

[5.3244]

static bool _build_minivaults(int level_number,
                              const map_def *vault,

Replacement in crawl-ref/source/dungeon.cc at line 218 [4.3429798]
B:BD[4.3435719] → [26.12533:12587]
```
static int  _dgn_random_map_for_place(bool wantmini);
```
[4.3435719]
[26.12587]
```
static const map_def *_dgn_random_map_for_place(bool wantmini);
```

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

B:BD[27.732] → [28.3947:4010]

        int vaultidx = random_map_for_tag("shoal_rune", true);

[27.732]

[29.3416]

        const map_def *vault = random_map_for_tag("shoal_rune", true);

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

B:BD[29.3417] → [5.3382:3447]

        _build_minivaults( level_number, vaultidx, false, false,

[29.3417]

[5.3447]

        _build_minivaults( level_number, vault, false, false,

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

B:BD[30.7849] → [26.19523:19583]

                vaultidx = _dgn_random_map_for_place(true);

[30.7849]

[30.7850]

                vault = _dgn_random_map_for_place(true);

Replacement in crawl-ref/source/dungeon.cc at line 2016 [4.3429798]
B:BD[30.7864] → [28.4011:4049]
```
            while ( vaultidx == -1 );
```
[30.7864]
[15.13503]
```
            while ( !vault );
```

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

B:BD[15.13504] → [5.3489:3558]

            _build_minivaults( level_number, vaultidx, false, false,

[15.13504]

[26.19659]

            _build_minivaults( level_number, vault, false, false,

Replacement in crawl-ref/source/dungeon.cc at line 2230 [4.3429798]
B:BD[12.960717] → [15.13633:13663]
```
            const int vault =
```
[12.960717]
[31.4015]
```
            const map_def *vault =
```

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

B:BD[12.960826] → [12.960826:960888]

            ASSERT(vault != -1);
            if (vault == -1)

[12.960826]

[32.891]

            ASSERT(vault);
            if (!vault)

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

∅:D[26.20464] → [33.148622:148679]

B:BD[4.3555164] → [33.148622:148679]

∅:D[33.148679] → [12.961181:961216]

B:BD[12.961181] → [12.961181:961216]

B:BD[12.961216] → [26.20465:20625]

            int vault = random_map_for_tag("pan", true);
            ASSERT( vault != -1 );
            // never output because of above assert
//            if (vault == -1)
//                end(1, false, "Failed to build Pandemonium minivault!\n");

[26.20464]

[15.13664]

            const map_def *vault = random_map_for_tag("pan", true);
            ASSERT( vault );

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

B:BD[34.32075] → [34.32075:32141]

    int vault = random_map_for_place(level_id::current(), false);

[34.32030]

[35.3419]

    const map_def *vault = random_map_for_place(level_id::current(), false);

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

B:BD[35.3434] → [36.8866:8956]

    if (vault == -1 && you.wizard
        && random_map_for_tag(level_name, false) != -1)

[35.3434]

[35.3469]

    if (!vault && you.wizard && random_map_for_tag(level_name, false))

Replacement in crawl-ref/source/dungeon.cc at line 2293 [4.3429798]
B:BD[35.3930] → [35.3930:3959]
```
            if (vault == -1)
```
[35.3930]
[36.9132]
```
            if (!vault)
```
Replacement in crawl-ref/source/dungeon.cc at line 2297 [4.3429798]
B:BD[26.20740] → [26.20740:20769]
```
        while (vault == -1);
```
[26.20740]
[35.4061]
```
        while (!vault);
```
Replacement in crawl-ref/source/dungeon.cc at line 2301 [4.3429798]
∅:D[35.4075] → [34.32141:32162]
B:BD[34.32141] → [34.32141:32162]
```
    if (vault == -1)
```
[35.4075]
[36.9233]
```
    if (!vault)
```
Replacement in crawl-ref/source/dungeon.cc at line 2304 [4.3429798]
B:BD[34.32216] → [34.32216:32237]
```
    if (vault != -1)
```
[34.32216]
[26.20770]
```
    if (vault)
```

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

B:BD[4.3555309] → [26.20928:20984]

static int _random_portal_vault(const std::string &tag)

[4.3555309]

[3.4688]

static const map_def *_random_portal_vault(const std::string &tag)

Replacement in crawl-ref/source/dungeon.cc at line 2338 [4.3429798]
B:BD[3.4816] → [26.21065:21114]
∅:D[26.21114] → [3.4864:4885]
B:BD[3.4864] → [3.4864:4885]
```
    const int vault = _random_portal_vault(tag);
    if (vault == -1)
```
[3.4816]
[3.4885]
```
    const map_def *vault = _random_portal_vault(tag);
    if (!vault)
```
Replacement in crawl-ref/source/dungeon.cc at line 2345 [4.3429798]
B:BD[3.4969] → [26.21173:21225]
```
static int _dgn_random_map_for_place(bool wantmini)
```
[3.4969]
[4.3555462]
```
static const map_def *_dgn_random_map_for_place(bool wantmini)
```

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

B:BD[8.2976] → [8.2976:3029]

    int vault = random_map_for_place(lid, wantmini);

[8.2976]

[15.13666]

    const map_def *vault = random_map_for_place(lid, wantmini);

Replacement in crawl-ref/source/dungeon.cc at line 2351 [4.3429798]
∅:D[37.4105] → [33.148880:148900]
∅:D[38.53411] → [33.148880:148900]
B:BD[33.148880] → [33.148880:148900]
```
    if (vault == -1
```
[37.4105]
[8.3030]
```
    if (!vault
```
Replacement in crawl-ref/source/dungeon.cc at line 2366 [4.3429798]
B:BD[33.149224] → [26.21287:21343]
```
    const int vault = _dgn_random_map_for_place(false);
```
[33.149224]
[33.149283]
```
    const map_def *vault = _dgn_random_map_for_place(false);
```
Replacement in crawl-ref/source/dungeon.cc at line 2368 [4.3429798]
∅:D[33.149284] → [12.961846:961867]
B:BD[12.961846] → [12.961846:961867]
```
    if (vault != -1)
```
[33.149284]
[12.961867]
```
    if (vault)
```

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

B:BD[34.33066] → [34.33066:33156]

            const int vault = random_map_for_tag(tag, true);
            if (vault == -1)

[34.33066]

[34.33156]

            const map_def *vault = random_map_for_tag(tag, true);
            if (!vault)

Replacement in crawl-ref/source/dungeon.cc at line 2425 [4.3429798]
B:BD[11.7371] → [28.4163:4187]
```
        int vault = -1;
```
[11.7371]
[28.4187]
```
        const map_def *vault = NULL;
```
Replacement in crawl-ref/source/dungeon.cc at line 2429 [4.3429798]
B:BD[28.4267] → [28.4267:4296]
```
            if (vault != -1)
```
[28.4267]
[28.4296]
```
            if (vault)
```

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

B:BD[28.4354] → [28.4354:4426]

        } while (vault != -1 && map_by_index(vault)->has_tag("extra"));

[28.4354]

[11.7574]

        } while (vault && vault->has_tag("extra"));

Replacement in crawl-ref/source/dungeon.cc at line 2437 [4.3429798]
B:BD[39.148305] → [26.21681:21740]
∅:D[9.1210] → [39.148366:148391]
∅:D[8.3381] → [39.148366:148391]
∅:D[26.21740] → [39.148366:148391]
B:BD[39.148366] → [39.148366:148391]
```
        const int vault = _dgn_random_map_for_place(true);
        if (vault == -1)
```
[39.148305]
[39.148391]
```
        const map_def *vault = _dgn_random_map_for_place(true);
        if (!vault)
```
Replacement in crawl-ref/source/dungeon.cc at line 2455 [4.3429798]
B:BD[4.3559771] → [26.21921:21971]
```
    int vault = _dgn_random_map_for_place(false);
```
[4.3559742]
[12.962295]
```
    const map_def *vault = _dgn_random_map_for_place(false);
```

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

B:BD[40.12994] → [23.13930:13990]

    if (vault == -1 && use_random_maps && can_create_vault)

[40.12994]

[6.1017]

    if (!vault && use_random_maps && can_create_vault)

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

∅:D[40.12996] → [41.1451:1578]

∅:D[15.13687] → [41.1451:1578]

B:BD[41.1451] → [41.1451:1578]

        if (vault != -1 && !player_in_branch(BRANCH_MAIN_DUNGEON)
            && map_by_index(vault)->orient != MAP_ENCOMPASS)

[40.12996]

[41.1578]

        if (vault && !player_in_branch(BRANCH_MAIN_DUNGEON)
            && vault->orient != MAP_ENCOMPASS)

Replacement in crawl-ref/source/dungeon.cc at line 2470 [4.3429798]
B:BD[41.1588] → [41.1588:1612]
```
            vault = -1;
```
[41.1588]
[41.1612]
```
            vault = NULL;
```
Replacement in crawl-ref/source/dungeon.cc at line 2474 [4.3429798]
B:BD[12.962500] → [12.962500:962521]
```
    if (vault != -1)
```
[12.962500]
[4.3559811]
```
    if (vault)
```

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

B:BD[28.4569] → [28.4569:4635]

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

[28.4569]

[41.1685]

            const map_def *vault = random_map_in_depth(level_id::current());

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

B:BD[28.4710] → [28.4710:4815]

            if (vault != -1 && map_by_index(vault)->orient == MAP_ENCOMPASS)
                vault = -1;

[28.4710]

[15.13756]

            if (vault && vault->orient == MAP_ENCOMPASS)
                vault = NULL;

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

B:BD[15.13757] → [28.4816:4914]

            if (vault != -1
                && _build_secondary_vault(you.your_level, vault, -1))

[15.13757]

[28.4914]

            if (vault && _build_secondary_vault(you.your_level, vault, -1))

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

B:BD[28.4928] → [28.4928:4986]

                const map_def &map(*map_by_index(vault));

[28.4928]

[28.4986]

                const map_def &map(*vault);

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

B:BD[42.2540] → [26.27788:27853]

static bool _build_minivaults(int level_number, int force_vault,

[42.2540]

[5.3559]

static bool _build_minivaults(int level_number, const map_def *vault,

Replacement in crawl-ref/source/dungeon.cc at line 3943 [4.3429798]
B:BD[43.6192] → [2.3790:3826]
```
    vault_main(place, force_vault);
```
[43.6192]
[44.4617]
```
    vault_main(place, vault);
```

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

[3.7769]

[7.6689]


void _fixup_after_vault()
{
    link_items();
    env.markers.activate_all();

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

[7.6690]

[45.285]

    // Force teleport to place the player somewhere sane.
    you_teleport_now(false, false);
    setup_environment_effects();
}

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

B:BD[45.709] → [5.3710:3772]

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

[45.709]

[5.3772]

bool dgn_place_map(const map_def *mdef, bool clobber, bool make_no_exits,

Deletion in crawl-ref/source/dungeon.cc at line 4388 [4.3429798]
∅:D[46.2483] → [7.6757:6802]
∅:D[15.14449] → [7.6757:6802]
B:BD[7.6757] → [7.6757:6802]
```
    const map_def *mdef = map_by_index(map);
```
Deletion in crawl-ref/source/dungeon.cc at line 4389 [4.3429798]
B:BD[7.6828] → [47.11115:11141]
∅:D[48.4289] → [7.6828:6829]
∅:D[47.11141] → [7.6828:6829]
B:BD[7.6828] → [7.6828:6829]
```
    bool fixup   = false;
```
Deletion in crawl-ref/source/dungeon.cc at line 4395 [4.3429798]
∅:D[5.3933] → [48.4483:4509]
B:BD[48.4483] → [48.4483:4509]
```
            fixup = true;
```

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

[48.4572]

            const bool res = dgn_place_map(mdef, clobber, make_no_exits,
                                           where);
            _fixup_after_vault();
            return (res);

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

B:BD[30.14394] → [5.3934:4000]

        did_map = _build_minivaults(you.your_level, map, clobber,

[30.14394]

[5.4000]

        did_map = _build_minivaults(you.your_level, mdef, clobber,

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

B:BD[26.31753] → [26.31753:31827]

        did_map = _build_secondary_vault(you.your_level, map, rune_subst,

[26.31753]

[5.4060]

        did_map = _build_secondary_vault(you.your_level, mdef, rune_subst,

Deletion in crawl-ref/source/dungeon.cc at line 4441 [4.3429798]
B:BD[7.7885] → [7.7885:7891]
```
    }
```

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

B:BD[48.4802] → [48.4802:4845]

B:BD[48.4845] → [49.6413:6449]

∅:D[49.6449] → [48.4877:4980]

B:BD[48.4877] → [48.4877:4980]

    if (fixup)
    {
        link_items();
        env.markers.activate_all();
        // Force teleport to place the player somewhere sane.
        you_teleport_now(false, false);

[48.4802]

[48.4980]

        setup_environment_effects();

Deletion in crawl-ref/source/dungeon.cc at line 4444 [4.3429798]
B:BD[48.4986] → [48.4986:4987]
B:BD[48.4987] → [5.4173:4209]
∅:D[5.4209] → [48.5023:5060]
B:BD[48.5023] → [48.5023:5060]
```
    if (fixup || !Generating_Level)
        setup_environment_effects();
```
Replacement in crawl-ref/source/dungeon.cc at line 4450 [4.3429798]
∅:D[40.13615] → [26.31960:32024]
B:BD[3.7898] → [26.31960:32024]
```
static bool _build_secondary_vault(int level_number, int vault,
```
[40.13615]
[5.4210]
```
static bool _build_secondary_vault(int level_number, const map_def *vault,
```

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

B:BD[3.8203] → [26.32386:32463]

static bool _build_vaults(int level_number, int force_vault, int rune_subst,

[3.8203]

[26.32463]

static bool _build_vaults(int level_number, const map_def *vault,
                          int rune_subst,

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

B:BD[15.14455] → [2.3952:4006]

∅:D[2.4006] → [5.4462:4515]

B:BD[7.8407] → [5.4462:4515]

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

[15.14455]

[44.4654]

    const int gluggy = vault_main(place, vault, check_collisions);

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

B:BD[4.3651034] → [19.3717:3783]

∅:D[19.3783] → [50.2873:2898]

B:BD[50.2873] → [50.2873:2898]

    const int vault = find_map_by_name("layout_forbidden_donut");
    ASSERT(vault != -1);

[4.3651034]

[4.3651070]

    const map_def *vault = find_map_by_name("layout_forbidden_donut");
    ASSERT(vault);

Replacement in crawl-ref/source/dungeon.cc at line 6157 [4.3429798]
B:BD[15.15203] → [19.3817:3873]
∅:D[19.3873] → [51.3198:3223]
B:BD[51.3198] → [51.3198:3223]
```
    const int vault = find_map_by_name("layout_cross");
    ASSERT(vault != -1);
```
[15.15203]
[4.3651609]
```
    const map_def *vault = find_map_by_name("layout_cross");
    ASSERT(vault);
```
Replacement in crawl-ref/source/dungeon.cc at line 6388 [4.3429798]
B:BD[4.3660190] → [19.4074:4136]
∅:D[19.4136] → [51.3420:3445]
B:BD[51.3420] → [51.3420:3445]
```
    const int vault = find_map_by_name("layout_big_octagon");
    ASSERT(vault != -1);
```
[4.3660190]
[4.3660325]
```
    const map_def *vault = find_map_by_name("layout_big_octagon");
    ASSERT(vault);
```

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

B:BD[42.3750] → [26.43984:44057]

static void _init_minivault_placement(int vault, vault_placement &place)

[42.3750]

[42.3822]

static void _init_minivault_placement(const map_def *vault,
                                      vault_placement &place)

Replacement in crawl-ref/source/dungeon.cc at line 6689 [4.3429798]
∅:D[52.9903] → [53.763:794]
B:BD[53.763] → [53.763:794]
```
    std::set<int> vaults_used;
```
[53.763]
[53.794]
```
    std::set<const map_def*> vaults_used;
```

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

B:BD[53.817] → [53.817:956]

        const int vault = random_map_for_tag("lab", true, false);
        if (vault == -1 || vaults_used.find(vault) != vaults_used.end())

[53.817]

[53.956]

        const map_def *vault = random_map_for_tag("lab", true, false);
        if (!vault || vaults_used.find(vault) != vaults_used.end())

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

B:BD[42.4426] → [53.1092:1153]

    int vault = random_map_for_tag("minotaur", true, false);

[42.4426]

[42.4482]

    const map_def *vault = random_map_for_tag("minotaur", true, false);

Replacement in crawl-ref/source/dungeon.cc at line 6767 [4.3429798]
B:BD[15.15545] → [54.5000:5021]
```
    if (vault != -1)
```
[15.15545]
[54.5021]
```
    if (vault)
```

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

B:BD[55.3970] → [54.5091:5155]

    if (vault == -1 || !_build_minivaults(level_number, vault))

[55.3970]

[42.4957]

    if (!vault || !_build_minivaults(level_number, vault))

Replacement in crawl-ref/source/dungeon.cc at line 6775 [4.3429798]
B:BD[42.4963] → [54.5156:5176]
```
        vault = -1;
```
[42.4963]
[54.5176]
```
        vault = NULL;
```
Replacement in crawl-ref/source/dungeon.cc at line 6801 [4.3429798]
B:BD[15.15547] → [54.5791:5812]
```
    if (vault != -1)
```
[15.15547]
[54.5812]
```
    if (vault)
```

Replacement in crawl-ref/source/decks.cc at line 2309 [4.3987460]

∅:D[40.27705] → [56.312:390]

B:BD[57.393] → [56.312:390]

B:BD[56.390] → [40.27706:27732]

        const int mapidx = random_map_for_tag("trowel_portal", false, false);
        if (mapidx == -1)

[40.27705]

[57.684]

        const map_def *map = random_map_for_tag("trowel_portal", false, false);
        if (!map)

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

B:BD[57.842] → [5.4563:4625]

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

[57.842]

[57.905]

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

Replacement in crawl-ref/source/debug.cc at line 3740 [4.4016436]
B:BD[7.9369] → [58.10210:10248]
∅:D[58.10248] → [7.9413:9432]
B:BD[7.9413] → [7.9413:9432]
```
    int map = find_map_by_name(name);
    if (map == -1)
```
[7.9369]
[7.9432]
```
    const map_def *toplace = find_map_by_name(name);
    if (!toplace)
```

Replacement in crawl-ref/source/debug.cc at line 3758 [4.4016436]

B:BD[58.10685] → [58.10685:10733]

            map = find_map_by_name(matches[0]);

[58.10685]

[58.10733]

            toplace = find_map_by_name(matches[0]);

Deletion in crawl-ref/source/debug.cc at line 3770 [4.4016436]
B:BD[7.9519] → [16.7375:7423]
```
    const map_def *toplace = map_by_index(map);
```

Replacement in crawl-ref/source/debug.cc at line 3777 [4.4016436]

B:BD[59.12521] → [5.4628:4676]

∅:D[60.1838] → [7.9560:9634]

∅:D[5.4676] → [7.9560:9634]

∅:D[16.7638] → [7.9560:9634]

B:BD[7.9560] → [7.9560:9634]

    if (dgn_place_map(map, true, false, where))
        mprf("Successfully placed %s.", map_by_index(map)->name.c_str());

[59.12521]

[7.9634]

    if (dgn_place_map(toplace, true, false, where))
        mprf("Successfully placed %s.", toplace->name.c_str());

Replacement in crawl-ref/source/debug.cc at line 3780 [4.4016436]

B:BD[7.9643] → [7.9643:9713]

        mprf("Failed to place %s.", map_by_index(map)->name.c_str());

[7.9643]

[7.9713]

        mprf("Failed to place %s.", toplace->name.c_str());

Replacement in crawl-ref/source/acr.cc at line 776 [4.4397395]

B:BD[36.12654] → [20.44130:44223]

        if (find_map_by_name(dst) == -1
            && random_map_for_tag(dst, false) == -1)

[36.12654]

[35.4494]

        if (!find_map_by_name(dst) && !random_map_for_tag(dst, false))

Use map_def* instead of map indices.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/maps.h at line 21 [4.2007036]

Replacement in crawl-ref/source/maps.h at line 30 [4.2007036]

Replacement in crawl-ref/source/maps.cc at line 41 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 60 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 65 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 68 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 74 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 95 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 108 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 312 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 316 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 318 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 476 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 565 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 568 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 575 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 581 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 587 [4.2007666]

Deletion in crawl-ref/source/maps.cc at line 593 [4.2007666]

Insertion in crawl-ref/source/maps.cc at line 863 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 896 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 900 [4.2007666]

Replacement in crawl-ref/source/dungeon.h at line 340 [4.3428186]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in crawl-ref/source/dungeon.cc at line 4388 [4.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4389 [4.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4395 [4.3429798]

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

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

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

Deletion in crawl-ref/source/dungeon.cc at line 4441 [4.3429798]

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

Deletion in crawl-ref/source/dungeon.cc at line 4444 [4.3429798]