fiddlerwoaroof/crawl - Change Q2AYZGR7UBWG4CKVR6PJQD3UHDEBMAFBQ5PZLHT64CTREG3JYFZAC

Let a level_id be directly compared to a branch type with == and != to

determine if a level_id is (not) in BRANCH_FOO; takes care of comparing level_type to LEVEL_DUNGEON.

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

Created by zelgadis on June 21, 2008

Q2AYZGR7UBWG4CKVR6PJQD3UHDEBMAFBQ5PZLHT64CTREG3JYFZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.h at line 259 [5.29464]

[4.817]

[5.34793]

    }
    bool operator == ( const branch_type _branch ) const
    {
        return (branch == _branch && level_type == LEVEL_DUNGEON);

Insertion in crawl-ref/source/travel.h at line 266 [5.29464]

[6.135]

    bool operator != ( const branch_type _branch  ) const
    {
        return !operator == (_branch);
    }

Replacement in crawl-ref/source/traps.cc at line 1006 [8.5308]
∅:D[2.1190] → [7.532:576]
B:BD[7.532] → [7.532:576]
```
    if (place.branch == BRANCH_MAIN_DUNGEON
```
[2.1190]
[7.576]
```
    if (place == BRANCH_MAIN_DUNGEON
```

Replacement in crawl-ref/source/traps.cc at line 1199 [8.5308]

B:BD[2.1250] → [2.1250:1362]

        || (place.branch == BRANCH_HALL_OF_ZOT
            && place.level_type == LEVEL_DUNGEON && coinflip()))

[2.1250]

[9.3962]

        || (place == BRANCH_HALL_OF_ZOT && coinflip()))

Replacement in crawl-ref/source/overmap.cc at line 154 [11.1070017]

B:BD[10.2388] → [10.2388:2454]

        if (na_iter->first.id.branch != BRANCH_ECUMENICAL_TEMPLE)

[10.2388]

[10.2454]

        if (na_iter->first.id != BRANCH_ECUMENICAL_TEMPLE)

Replacement in crawl-ref/source/monplace.cc at line 275 [11.1641732]
B:BD[12.5135] → [12.5135:5179]
```
    if (place.branch == BRANCH_MAIN_DUNGEON
```
[12.5135]
[12.5179]
```
    if (place == BRANCH_MAIN_DUNGEON
```
Replacement in crawl-ref/source/monplace.cc at line 281 [11.1641732]
B:BD[12.5274] → [12.5274:5318]
```
    if (place.branch == BRANCH_MAIN_DUNGEON
```
[12.5274]
[12.5318]
```
    if (place == BRANCH_MAIN_DUNGEON
```

Replacement in crawl-ref/source/monplace.cc at line 488 [11.1641732]

B:BD[11.1643443] → [3.2573:2683]

        if (place.branch == BRANCH_HALL_OF_BLADES
            && place.level_type == LEVEL_DUNGEON)
        {

[11.1643443]

[13.4089]

        if (place == BRANCH_HALL_OF_BLADES)

Deletion in crawl-ref/source/monplace.cc at line 490 [11.1641732]
B:BD[13.4133] → [3.2684:2694]
```
        }
```

Replacement in crawl-ref/source/misc.cc at line 1702 [11.1933596]

B:BD[5.250619] → [14.3189:3316]

            if (new_level_id.branch == BRANCH_MAIN_DUNGEON
                && old_level_id.branch == BRANCH_VESTIBULE_OF_HELL)

[5.250619]

[5.250750]

            if (new_level_id == BRANCH_MAIN_DUNGEON
                && old_level_id == BRANCH_VESTIBULE_OF_HELL)

Replacement in crawl-ref/source/misc.cc at line 1716 [11.1933596]

B:BD[5.251239] → [5.251239:251304]

            if (new_level_id.branch != BRANCH_VESTIBULE_OF_HELL)

[5.251239]

[5.251304]

            if (new_level_id != BRANCH_VESTIBULE_OF_HELL)