fiddlerwoaroof/crawl - Change NJEEPJ3IX7MMYCHFVFLX3AHQQYBDGIKK6WZE3ZFXZ67XK3Y3T57QC

Treat all bazaars as noteworthy, not just the first one.

Since bazaars are currently the only type of portal chambers, just refer to them as bazaars in the notes. (The subchecks for the "bazaar" flag don't work with packed_place, unfortunately.)

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

Created by j-p-e-g on June 15, 2008

NJEEPJ3IX7MMYCHFVFLX3AHQQYBDGIKK6WZE3ZFXZ67XK3Y3T57QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/place.cc at line 52 [3.51817]
[3.52913]
[3.52913]
Insertion in crawl-ref/source/place.cc at line 55 [3.51817]
[3.53031]
[3.53031]

Replacement in crawl-ref/source/place.cc at line 61 [3.51817]

B:BD[3.53088] → [3.53088:53251]

    return get_packed_place( you.where_are_you,
                      subdungeon_depth(you.where_are_you, you.your_level),
                      you.level_type );

[3.53088]

[3.53251]

    return get_packed_place(you.where_are_you,
                            subdungeon_depth(you.where_are_you, you.your_level),
                            you.level_type);

Replacement in crawl-ref/source/place.cc at line 92 [3.51817]

B:BD[3.53988] → [4.183:234]

            if ( you.level_type_name == "bazaar" )

[3.53988]

[4.234]

        // FIXME: While there are no further portal vaults, declare all
        //        portal vaults as bazaars.
//            if (you.level_type_name == "bazaar")

Replacement in crawl-ref/source/place.cc at line 97 [3.51817]
∅:D[4.297] → [3.53988:54052]
B:BD[3.53988] → [3.53988:54052]
```
            return ( long_name ? "a Portal Chamber" : "Port" );
```
[4.297]
[3.54052]
```
//            return ( long_name ? "a Portal Chamber" : "Port" );
```

Replacement in crawl-ref/source/place.cc at line 142 [3.51817]

B:BD[3.55422] → [3.55422:55514]

    return (place.find("level") == 0?
            "on " + place
          : "in " + place);

[3.55422]

[3.55514]

    return (place.find("level") == 0 ? "on " + place
                                     : "in " + place);

Replacement in crawl-ref/source/notes.cc at line 92 [7.370339]
∅:D[5.5567] → [6.6447:6468]
B:BD[7.372897] → [6.6447:6468]
```
        return true;
```
[5.5567]
[5.5568]
```
        return (true);
```
Replacement in crawl-ref/source/notes.cc at line 98 [7.370339]
∅:D[5.5733] → [6.6586:6607]
B:BD[6.6586] → [6.6586:6607]
```
        return true;
```
[5.5733]
[5.5734]
```
        return (true);
```
Replacement in crawl-ref/source/notes.cc at line 101 [7.370339]
B:BD[7.373082] → [7.373082:373100]
```
    return false;
```
[7.373082]
[7.373100]
```
    return (false);
```
Replacement in crawl-ref/source/notes.cc at line 127 [7.370339]
∅:D[8.1522] → [6.6898:6919]
∅:D[5.6607] → [6.6898:6919]
B:BD[9.365] → [6.6898:6919]
```
        return true;
```
[5.6607]
[5.6608]
```
        return (true);
```
Replacement in crawl-ref/source/notes.cc at line 135 [7.370339]
∅:D[5.6743] → [6.7045:7067]
B:BD[6.7045] → [6.7045:7067]
```
        return false;
```
[5.6743]
[5.6744]
```
        return (false);
```
Replacement in crawl-ref/source/notes.cc at line 142 [7.370339]
∅:D[5.6852] → [6.7125:7147]
B:BD[6.7125] → [6.7125:7147]
```
        return false;
```
[5.6852]
[5.6853]
```
        return (false);
```
Replacement in crawl-ref/source/notes.cc at line 149 [7.370339]
∅:D[10.1242] → [6.7202:7224]
B:BD[6.7202] → [6.7202:7224]
```
        return false;
```
[10.1242]
[10.1243]
```
        return (false);
```
Replacement in crawl-ref/source/notes.cc at line 160 [7.370339]
∅:D[5.7171] → [6.7374:7399]
B:BD[6.7374] → [6.7374:7399]
```
            return true;
```
[5.7171]
[5.7172]
```
            return (true);
```
Replacement in crawl-ref/source/notes.cc at line 162 [7.370339]
∅:D[5.7182] → [6.7399:7421]
B:BD[6.7399] → [6.7399:7421]
```
        return false;
```
[5.7182]
[7.374614]
```
        return (false);
```
Replacement in crawl-ref/source/notes.cc at line 168 [7.370339]
∅:D[5.7287] → [11.233:259]
B:BD[11.233] → [11.233:259]
```
            return false;
```
[5.7287]
[5.7288]
```
            return (false);
```

Replacement in crawl-ref/source/notes.cc at line 170 [7.370339]

B:BD[5.7289] → [2.7169:7215]

        // Labyrinths are always interesting.

[5.7289]

[5.7290]

        // Labyrinths and portal vaults are always interesting.

Replacement in crawl-ref/source/notes.cc at line 172 [7.370339]

B:BD[5.7337] → [5.7337:7397]

            && (note.packed_place >> 8) == LEVEL_LABYRINTH)

[5.7337]

[5.7397]

            && ((note.packed_place >> 8) == LEVEL_LABYRINTH
                || (note.packed_place >> 8) == LEVEL_PORTAL_VAULT))

Replacement in crawl-ref/source/notes.cc at line 175 [7.370339]
∅:D[5.7407] → [11.414:439]
B:BD[11.414] → [11.414:439]
```
            return true;
```
[5.7407]
[5.7408]
```
            return (true);
```
Replacement in crawl-ref/source/notes.cc at line 181 [7.370339]
∅:D[5.7487] → [6.7422:7443]
B:BD[7.374883] → [6.7422:7443]
```
        return true;
```
[5.7487]
[7.374897]
```
        return (true);
```
Replacement in crawl-ref/source/notes.cc at line 193 [7.370339]
∅:D[5.7673] → [6.7684:7714]
B:BD[6.7684] → [6.7684:7714]
```
                return false;
```
[5.7673]
[6.7714]
```
                return (false);
```
Replacement in crawl-ref/source/notes.cc at line 199 [7.370339]
∅:D[12.13983] → [6.7843:7873]
B:BD[6.7843] → [6.7843:7873]
```
                return false;
```
[12.13983]
[12.13984]
```
                return (false);
```
Replacement in crawl-ref/source/notes.cc at line 204 [7.370339]
∅:D[5.7894] → [6.7997:8027]
B:BD[6.7997] → [6.7997:8027]
```
                return false;
```
[5.7894]
[6.8027]
```
                return (false);
```
Replacement in crawl-ref/source/notes.cc at line 212 [7.370339]
∅:D[5.8106] → [6.8503:8533]
B:BD[6.8503] → [6.8503:8533]
```
                return false;
```
[5.8106]
[5.8107]
```
                return (false);
```
Replacement in crawl-ref/source/notes.cc at line 219 [7.370339]
B:BD[13.4257] → [13.4257:4282]
```
            return true;
```
[13.4257]
[7.376045]
```
            return (true);
```
Replacement in crawl-ref/source/notes.cc at line 222 [7.370339]
B:BD[7.376061] → [7.376061:376078]
```
    return true;
```
[7.376061]
[7.376078]
```
    return (true);
```

Replacement in crawl-ref/source/notes.cc at line 381 [7.370339]

B:BD[14.1006] → [14.1006:1051]

            dep = place_depth(packed_place);

[14.1006]

[7.379999]

                 dep = place_depth(packed_place);

Treat all bazaars as noteworthy, not just the first one.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/place.cc at line 52 [3.51817]

Insertion in crawl-ref/source/place.cc at line 55 [3.51817]

Replacement in crawl-ref/source/place.cc at line 61 [3.51817]

Replacement in crawl-ref/source/place.cc at line 92 [3.51817]

Replacement in crawl-ref/source/place.cc at line 97 [3.51817]

Replacement in crawl-ref/source/place.cc at line 142 [3.51817]

Replacement in crawl-ref/source/notes.cc at line 92 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 98 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 101 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 127 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 135 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 142 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 149 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 160 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 162 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 168 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 170 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 172 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 175 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 181 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 193 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 199 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 204 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 212 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 219 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 222 [7.370339]

Replacement in crawl-ref/source/notes.cc at line 381 [7.370339]