fiddlerwoaroof/crawl - Change ANBVGN4RZOMY5LI4QSHOV2477FN55H353ZYLSVCPTXC7AWWSQZBAC

Fix level compiler to validate PLACE: declarations.

Places are saved as level_ids, not strings.

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

Created by dshaligram on July 6, 2007

ANBVGN4RZOMY5LI4QSHOV2477FN55H353ZYLSVCPTXC7AWWSQZBAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.h at line 173 [6.29464]

[4.691]

[5.564]


    static level_id parse_level_id(const std::string &s) throw (std::string);

Replacement in crawl-ref/source/travel.h at line 179 [6.29464]
B:BD[5.607] → [7.15:32]
```
    void reset()
```
[5.607]
[7.32]
```
    void clear()
```
Replacement in crawl-ref/source/travel.h at line 259 [6.29464]
B:BD[6.35862] → [7.127:144]
```
    void reset()
```
[6.35862]
[7.144]
```
    void clear()
```
Replacement in crawl-ref/source/travel.h at line 261 [6.29464]
B:BD[7.150] → [7.150:170]
```
        id.reset();
```
[7.150]
[7.170]
```
        id.clear();
```
Replacement in crawl-ref/source/travel.h at line 284 [6.29464]
B:BD[2.580] → [2.580:599]
```
        p.reset();
```
[2.580]
[2.599]
```
        p.clear();
```
Replacement in crawl-ref/source/travel.h at line 354 [6.29464]
B:BD[6.36442] → [6.36442:36468]
```
    void reset_distance()
```
[6.36442]
[6.36468]
```
    void clear_distance()
```
Replacement in crawl-ref/source/travel.h at line 399 [6.29464]
B:BD[6.37096] → [6.37096:37124]
```
    void reset_distances();
```
[6.37096]
[6.37124]
```
    void clear_distances();
```
Replacement in crawl-ref/source/travel.h at line 449 [6.29464]
B:BD[6.38593] → [6.38593:38621]
```
    void reset_distances();
```
[6.38593]
[6.38621]
```
    void clear_distances();
```
Replacement in crawl-ref/source/travel.cc at line 2533 [6.39949]
B:BD[6.107042] → [6.107042:107078]
```
    travel_cache.reset_distances();
```
[6.107042]
[6.107078]
```
    travel_cache.clear_distances();
```

Insertion in crawl-ref/source/travel.cc at line 2713 [6.39949]

[5.1552]

}
level_id level_id::parse_level_id(const std::string &s) throw (std::string)
{
    std::string::size_type cpos = s.find(':');
    std::string branch =
        cpos != std::string::npos? s.substr(0, cpos) : s;
    std::string depth =
        cpos != std::string::npos? s.substr(cpos + 1) : "";
    if (branch == "Abyss")
        return (level_id(LEVEL_ABYSS));
    else if (branch == "Pan")
        return (level_id(LEVEL_PANDEMONIUM));
    else if (branch == "Lab")
        return (level_id(LEVEL_LABYRINTH));
    const branch_type br = str_to_branch(branch);
    if (br == NUM_BRANCHES)
        throw make_stringf("Invalid branch \"%s\" in spec \"%s\"",
                           branch.c_str(), s.c_str());
    const int dep =
        depth.empty()? 1 :
        depth == "$" ? branches[br].depth :
                       atoi(depth.c_str());
    
    if (dep < 0 || dep > branches[br].depth)
        throw make_stringf("Invalid depth for %s in spec \"%s\"",
                           branch.c_str(), s.c_str());
    return level_id(br, dep);

Replacement in crawl-ref/source/travel.cc at line 3028 [6.39949]
B:BD[6.121988] → [6.121988:122022]
```
void LevelInfo::reset_distances()
```
[6.121988]
[6.122022]
```
void LevelInfo::clear_distances()
```
Replacement in crawl-ref/source/travel.cc at line 3032 [6.39949]
B:BD[6.122089] → [6.122089:122125]
```
        stairs[i].reset_distance();
```
[6.122089]
[6.122125]
```
        stairs[i].clear_distance();
```

Replacement in crawl-ref/source/travel.cc at line 3216 [6.39949]

B:BD[7.703] → [7.703:743]

                waypoints[key].reset();

[7.703]

[7.743]

                waypoints[key].clear();

Replacement in crawl-ref/source/travel.cc at line 3223 [6.39949]

B:BD[7.892] → [7.892:930]

                waypoints[i].reset();

[7.892]

[7.930]

                waypoints[i].clear();

Replacement in crawl-ref/source/travel.cc at line 3292 [6.39949]
B:BD[6.128390] → [6.128390:128426]
```
void TravelCache::reset_distances()
```
[6.128390]
[6.128426]
```
void TravelCache::clear_distances()
```
Replacement in crawl-ref/source/travel.cc at line 3296 [6.39949]
B:BD[6.128569] → [6.128569:128606]
```
        i->second.reset_distances();
```
[6.128569]
[6.128606]
```
        i->second.clear_distances();
```

Replacement in crawl-ref/source/maps.h at line 43 [10.2007036]

∅:D[8.176] → [9.583152:583223]

B:BD[10.2007626] → [9.583152:583223]

B:BD[9.583223] → [11.2941:3017]

int random_map_for_place(const std::string &place, bool mini = false);
int random_map_for_depth(const level_id &lid, bool want_minivault = false);

[8.176]

[12.577]

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);

Replacement in crawl-ref/source/maps.h at line 63 [10.2007036]
B:BD[13.370] → [13.370:406]
```
const int MAP_CACHE_VERSION = 1003;
```
[13.370]
[9.583441]
```
const int MAP_CACHE_VERSION = 1004;
```

Replacement in crawl-ref/source/maps.cc at line 284 [10.2007666]

B:BD[9.588056] → [9.588056:588128]

int random_map_for_place(const std::string &place, bool want_minivault)

[9.588056]

[10.2185297]

int random_map_for_place(const level_id &place, bool want_minivault)

Replacement in crawl-ref/source/maps.cc at line 286 [10.2007666]
B:BD[10.2185299] → [9.588129:588152]
```
    if (place.empty())
```
[10.2185299]
[9.588152]
```
    if (!place.is_valid())
```

Replacement in crawl-ref/source/maps.cc at line 296 [10.2007666]

B:BD[9.588369] → [9.588369:588431]

                && vdefs[i].is_minivault() == want_minivault)

[9.588369]

[9.588431]

            && vdefs[i].is_minivault() == want_minivault)

Replacement in crawl-ref/source/maps.cc at line 308 [10.2007666]

B:BD[9.588700] → [9.588700:588762]

                vdefs[mapindex].name.c_str(), place.c_str());

[9.588700]

[9.588762]

             vdefs[mapindex].name.c_str(), place.describe().c_str());

Replacement in crawl-ref/source/maps.cc at line 314 [10.2007666]

B:BD[10.2196213] → [11.3019:3088]

int random_map_for_depth(const level_id &place, bool want_minivault)

[10.2196213]

[10.2196775]

int random_map_in_depth(const level_id &place, bool want_minivault)

Insertion in crawl-ref/source/mapdef.h at line 19 [9.591249]
[14.139801]
[9.591866]
```
#include "travel.h"
```
Replacement in crawl-ref/source/mapdef.h at line 474 [9.591249]
B:BD[9.593326] → [9.593326:593353]
```
    std::string     place;
```
[9.593326]
[11.3948]
```
    level_id        place;
```
Replacement in crawl-ref/source/mapdef.cc at line 1184 [9.594797]
B:BD[15.8245] → [15.8245:8275]
```
    writeString(outf, place);
```
[15.8245]
[15.8275]
```
    place.save(outf);
```
Replacement in crawl-ref/source/mapdef.cc at line 1196 [9.594797]
B:BD[15.8619] → [15.8619:8655]
```
    place        = readString(inf);
```
[15.8619]
[15.8655]
```
    place.load(inf);
```

Insertion in crawl-ref/source/mapdef.cc at line 2115 [9.594797]

[16.581]

[17.96]

        return (result);
    }
    else if (s == "$" || s == "gold")
    {
        result.base_type = OBJ_GOLD;
        result.sub_type = OBJ_RANDOM;

Replacement in crawl-ref/source/luadgn.cc at line 356 [18.1232]

B:BD[18.5522] → [18.5522:5572]

            map->place = luaL_checkstring(ls, 2);

[18.5522]

[18.5572]

        {
            try
            {
                map->place = level_id::parse_level_id(luaL_checkstring(ls, 2));
            }
            catch (const std::string &err)
            {
                luaL_error(ls, err.c_str());
            }
        }

Replacement in crawl-ref/source/luadgn.cc at line 367 [18.1232]
B:BD[18.5578] → [18.5578:5619]
```
    PLUARET(string, map->place.c_str());
```
[18.5578]
[18.5619]
```
    PLUARET(string, map->place.describe().c_str());
```
Deletion in crawl-ref/source/dungeon.cc at line 211 [10.3429798]
∅:D[19.6205] → [20.1763:1764]
B:BD[20.1763] → [20.1763:1764]
∅:D[20.1764] → [9.948919:949091]
B:BD[10.3435802] → [9.948919:949091]
∅:D[21.190] → [9.949298:949300]
∅:D[22.307] → [9.949298:949300]
B:BD[9.949298] → [9.949298:949300]
```
static std::string level_name(int subdepth)
{
    return place_name(
                get_packed_place(
                    you.where_are_you, subdepth, you.level_type ) );
}
```
Replacement in crawl-ref/source/dungeon.cc at line 1095 [10.3429798]
∅:D[23.4969] → [8.662:736]
B:BD[10.3555309] → [8.662:736]
```
static int random_map_for_dlevel(int level_number, bool wantmini = false)
```
[23.4969]
[10.3555462]
```
static int dgn_random_map_for_place(bool wantmini)
```

Replacement in crawl-ref/source/dungeon.cc at line 1097 [10.3429798]

B:BD[10.3555464] → [9.961483:961630]

B:BD[9.961630] → [14.148732:148868]

B:BD[14.148868] → [24.669:710]

∅:D[24.710] → [9.961699:961733]

∅:D[25.12780] → [9.961699:961733]

B:BD[9.961699] → [9.961699:961733]

B:BD[9.961733] → [8.737:791]

∅:D[8.791] → [14.148869:148874]

B:BD[9.961777] → [14.148869:148874]

∅:D[14.148874] → [9.961777:961798]

B:BD[9.961777] → [9.961777:961798]

B:BD[9.961798] → [8.792:849]

    int subdepth = subdungeon_depth(you.where_are_you, level_number);
    const std::string name = level_name(subdepth);
    std::string altname;
    // This dodge allows designers to specify PLACE: as Elf:$ or Slime:$ or
    // whatever:$ to say "last level in branch 'whatever'".
    if (subdepth == your_branch().depth)
        altname = level_name(0);
    int vault = random_map_for_place(name, wantmini);
    
    if (vault == -1)
        vault = random_map_for_place(altname, wantmini);

[10.3555464]

[14.148875]

    const level_id lid = level_id::current();
    int vault = random_map_for_place(lid, wantmini);

Replacement in crawl-ref/source/dungeon.cc at line 1102 [10.3429798]

B:BD[14.148900] → [14.148900:148952]

B:BD[14.148952] → [26.53412:53468]

        && you.where_are_you == BRANCH_MAIN_DUNGEON
        && level_number == 0 && !Options.tutorial_left)

[14.148900]

[14.148982]

        && lid.branch == BRANCH_MAIN_DUNGEON
        && lid.depth == 1 && !Options.tutorial_left)

Replacement in crawl-ref/source/dungeon.cc at line 1116 [10.3429798]
B:BD[14.149224] → [14.149224:149283]
```
    const int vault = random_map_for_dlevel(level_number);
```
[14.149224]
[14.149283]
```
    const int vault = dgn_random_map_for_place(false);
```

Replacement in crawl-ref/source/dungeon.cc at line 1150 [10.3429798]

B:BD[11.7371] → [11.7371:7446]

        const int vault = random_map_for_depth(level_id::current(), true);

[11.7371]

[11.7446]

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

Replacement in crawl-ref/source/dungeon.cc at line 1166 [10.3429798]

B:BD[3.891] → [3.891:964]

            const int vault = random_map_for_dlevel(level_number, true);

[3.891]

[3.964]

            const int vault = dgn_random_map_for_place(true);

Replacement in crawl-ref/source/dungeon.cc at line 1191 [10.3429798]

B:BD[27.148305] → [8.1141:1210]

        const int vault = random_map_for_dlevel(level_number, true);

[27.148305]

[27.148366]

        const int vault = dgn_random_map_for_place(true);

Replacement in crawl-ref/source/dungeon.cc at line 1220 [10.3429798]
B:BD[10.3559771] → [14.149686:149740]
```
    int vault = random_map_for_dlevel(level_number); 
```
[10.3559771]
[9.962295]
```
    int vault = dgn_random_map_for_place(false); 
```

Replacement in crawl-ref/source/dungeon.cc at line 1226 [10.3429798]

B:BD[28.1923] → [11.7632:7691]

        vault = random_map_for_depth(level_id::current());

[28.1923]

[9.962499]

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

Replacement in crawl-ref/source/dat/lair.des at line 227 [29.144230]
B:BD[29.150140] → [29.150140:150156]
```
PLACE: Shoals:5
```
[29.150140]
[29.150156]
```
PLACE: Shoal:5
```
Replacement in crawl-ref/source/dat/lair.des at line 265 [29.144230]
B:BD[29.151162] → [29.151162:151178]
```
PLACE: Shoals:5
```
[29.151162]
[29.151178]
```
PLACE: Shoal:5
```
Replacement in crawl-ref/source/dat/lair.des at line 302 [29.144230]
B:BD[29.152024] → [29.152024:152040]
```
PLACE: Shoals:5
```
[29.152024]
[29.152040]
```
PLACE: Shoal:5
```
Replacement in crawl-ref/source/dat/lair.des at line 315 [29.144230]
B:BD[29.152315] → [29.152315:152331]
```
PLACE: Shoals:5
```
[29.152315]
[29.152331]
```
PLACE: Shoal:5
```

Fix level compiler to validate PLACE: declarations.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.h at line 173 [6.29464]

Replacement in crawl-ref/source/travel.h at line 179 [6.29464]

Replacement in crawl-ref/source/travel.h at line 259 [6.29464]

Replacement in crawl-ref/source/travel.h at line 261 [6.29464]

Replacement in crawl-ref/source/travel.h at line 284 [6.29464]

Replacement in crawl-ref/source/travel.h at line 354 [6.29464]

Replacement in crawl-ref/source/travel.h at line 399 [6.29464]

Replacement in crawl-ref/source/travel.h at line 449 [6.29464]

Replacement in crawl-ref/source/travel.cc at line 2533 [6.39949]

Insertion in crawl-ref/source/travel.cc at line 2713 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 3028 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 3032 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 3216 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 3223 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 3292 [6.39949]

Replacement in crawl-ref/source/travel.cc at line 3296 [6.39949]

Replacement in crawl-ref/source/maps.h at line 43 [10.2007036]

Replacement in crawl-ref/source/maps.h at line 63 [10.2007036]

Replacement in crawl-ref/source/maps.cc at line 284 [10.2007666]

Replacement in crawl-ref/source/maps.cc at line 286 [10.2007666]

Replacement in crawl-ref/source/maps.cc at line 296 [10.2007666]

Replacement in crawl-ref/source/maps.cc at line 308 [10.2007666]

Replacement in crawl-ref/source/maps.cc at line 314 [10.2007666]

Insertion in crawl-ref/source/mapdef.h at line 19 [9.591249]

Replacement in crawl-ref/source/mapdef.h at line 474 [9.591249]

Replacement in crawl-ref/source/mapdef.cc at line 1184 [9.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1196 [9.594797]

Insertion in crawl-ref/source/mapdef.cc at line 2115 [9.594797]

Replacement in crawl-ref/source/luadgn.cc at line 356 [18.1232]

Replacement in crawl-ref/source/luadgn.cc at line 367 [18.1232]

Deletion in crawl-ref/source/dungeon.cc at line 211 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1095 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1097 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1102 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1116 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1150 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1166 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1191 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1220 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1226 [10.3429798]

Replacement in crawl-ref/source/dat/lair.des at line 227 [29.144230]

Replacement in crawl-ref/source/dat/lair.des at line 265 [29.144230]

Replacement in crawl-ref/source/dat/lair.des at line 302 [29.144230]

Replacement in crawl-ref/source/dat/lair.des at line 315 [29.144230]