fiddlerwoaroof/crawl - Change KYKFOLADMUWUGJG2YWH2SSQRPRU5VOLSORANZKHDYGJSLIKVAXUQC

More fixes so 1916515 doesn't happen again.

Add BRANCH_FIRST_HELL and BRANCH_LAST_HELL and check vs those in player_in_hell() rather than hard-coding the enums. Whoever did that is naughty; they should have at least stuck a comment in the branch enum.

Also added some compile-checks in player_in_hell to draw attention in case the hell branches are touched.

Also added some startup code that verifies the branches[] array (whose name should be changed to Branches!) is in the same order as the branches enum.

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

Created by pauldubois on March 17, 2008

KYKFOLADMUWUGJG2YWH2SSQRPRU5VOLSORANZKHDYGJSLIKVAXUQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 375 [4.962854]

[4.965349]

    // No real reason except to draw someone's attention here if they
    // mess with the branch enum.
    COMPILE_CHECK(BRANCH_FIRST_HELL == BRANCH_DIS, a);
    COMPILE_CHECK(BRANCH_LAST_HELL  == BRANCH_THE_PIT, b);

Replacement in crawl-ref/source/player.cc at line 381 [4.962854]

B:BD[4.965393] → [4.965393:965498]

            && (you.where_are_you >= BRANCH_DIS 
                && you.where_are_you <= BRANCH_THE_PIT)

[4.965393]

[4.965498]

            && (   you.where_are_you >= BRANCH_FIRST_HELL
                && you.where_are_you <= BRANCH_LAST_HELL)

Insertion in crawl-ref/source/enum.h at line 332 [4.3287960]
[5.11243]
[5.11243]
```
    BRANCH_FIRST_HELL = BRANCH_DIS,
```
Insertion in crawl-ref/source/enum.h at line 338 [4.3287960]
[5.11402]
[3.2645]
```
    BRANCH_LAST_HELL = BRANCH_THE_PIT,
```

Insertion in crawl-ref/source/acr.cc at line 4402 [4.4397395]

[2.5736]

[6.41511]


    // Also some runtime stuff; I don't know if the order of branches[]
    // needs to match the enum, but it currently does.
    for (int i=0; i<NUM_BRANCHES; i++)
    {
        ASSERT(branches[i].id == i);
    }