fiddlerwoaroof/crawl - Change YFDAMED4EYMCYLBVU5MDKOCCRKK5MILLCR3N4J5MRJGODDCZUKXAC

Remove references to unimplemented branches (Caverns, Pit, Inferno).

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

Created by j-p-e-g on March 14, 2009

YFDAMED4EYMCYLBVU5MDKOCCRKK5MILLCR3N4J5MRJGODDCZUKXAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 4476 [6.16817]
∅:D[4.109] → [5.55298:55406]
∅:D[7.112] → [5.55298:55406]
B:BD[5.55298] → [5.55298:55406]
```
        case DNGN_ENTER_RESERVED_2:
        case DNGN_ENTER_RESERVED_3:
        case DNGN_ENTER_RESERVED_4:
```
Deletion in crawl-ref/source/view.cc at line 4506 [6.16817]
∅:D[4.148] → [5.56465:56576]
∅:D[7.152] → [5.56465:56576]
B:BD[5.56465] → [5.56465:56576]
```
        case DNGN_RETURN_RESERVED_2:
        case DNGN_RETURN_RESERVED_3:
        case DNGN_RETURN_RESERVED_4:
```

Deletion in crawl-ref/source/terrain.cc at line 129 [8.26938]

B:BD[8.29634] → [8.29634:29733]

    case DNGN_RETURN_RESERVED_2:
    case DNGN_RETURN_RESERVED_3:
    case DNGN_RETURN_RESERVED_4:

Deletion in crawl-ref/source/terrain.cc at line 164 [8.26938]

B:BD[8.30764] → [8.30764:30860]

    case DNGN_ENTER_RESERVED_2:
    case DNGN_ENTER_RESERVED_3:
    case DNGN_ENTER_RESERVED_4:

Replacement in crawl-ref/source/player.cc at line 399 [6.962854]

B:BD[9.2677] → [9.2677:2736]

    COMPILE_CHECK(BRANCH_LAST_HELL  == BRANCH_THE_PIT, b);

[9.2677]

[9.2736]

    COMPILE_CHECK(BRANCH_LAST_HELL  == BRANCH_TARTARUS, b);

Replacement in crawl-ref/source/player.cc at line 4349 [6.962854]
B:BD[6.1043941] → [2.3122:3162]
```
bool player_has_spell(spell_type spell)
```
[6.1043941]
[6.1043976]
```
bool player_has_spell( spell_type spell )
```

Deletion in crawl-ref/source/mon-pick.cc at line 2344 [6.1767507]

B:BD[6.1814316] → [6.1814316:1814322]

B:BD[6.1814322] → [10.25828:25830]

∅:D[10.25830] → [5.491514:491515]

B:BD[6.1814381] → [5.491514:491515]

B:BD[5.491515] → [10.25831:25855]

∅:D[10.25855] → [11.7098:7133]

B:BD[5.491515] → [11.7098:7133]

∅:D[11.7133] → [5.491557:491559]

B:BD[5.491557] → [5.491557:491559]

B:BD[5.491560] → [11.7134:7186]

∅:D[11.7186] → [5.491614:492233]

B:BD[5.491614] → [5.491614:492233]

    }
}
// The Caverns (unused)
int mons_caverns_level( int mcls )
{
    int mlev = absdungeon_depth(BRANCH_CAVERNS, 1);
    switch (mcls)
    {
    case MONS_YELLOW_DRACONIAN:
    case MONS_BLACK_DRACONIAN:
    case MONS_WHITE_DRACONIAN:
    case MONS_RED_DRACONIAN:
    case MONS_PURPLE_DRACONIAN:
    case MONS_PALE_DRACONIAN:
    case MONS_GREEN_DRACONIAN:
    case MONS_MOTTLED_DRACONIAN:
        mlev++;
        break;
    case MONS_DRACONIAN_CALLER:
    case MONS_DRACONIAN_MONK:
    case MONS_DRACONIAN_SCORCHER:
    case MONS_DRACONIAN_KNIGHT:
    case MONS_DRACONIAN_ANNIHILATOR:
    case MONS_DRACONIAN_ZEALOT:
    case MONS_DRACONIAN_SHIFTER:
        mlev += 3;
        break;
    default:
        mlev += 99;
        break;

Deletion in crawl-ref/source/mon-pick.cc at line 2345 [6.1767507]
∅:D[5.492239] → [6.1814381:1814382]
B:BD[6.1814381] → [6.1814381:1814382]
B:BD[6.1814382] → [5.492240:492259]
```
    return (mlev);
```

Deletion in crawl-ref/source/mon-pick.cc at line 2347 [6.1767507]

B:BD[5.492262] → [11.7187:7221]

∅:D[11.7221] → [5.492303:492873]

B:BD[5.492303] → [5.492303:492873]

int mons_caverns_rare( int mcls )
{
    switch (mcls)
    {
    case MONS_YELLOW_DRACONIAN:
    case MONS_BLACK_DRACONIAN:
    case MONS_WHITE_DRACONIAN:
    case MONS_RED_DRACONIAN:
    case MONS_PURPLE_DRACONIAN:
    case MONS_PALE_DRACONIAN:
    case MONS_GREEN_DRACONIAN:
    case MONS_MOTTLED_DRACONIAN:
    case MONS_DRACONIAN_CALLER:
    case MONS_DRACONIAN_MONK:
    case MONS_DRACONIAN_SCORCHER:
    case MONS_DRACONIAN_KNIGHT:
    case MONS_DRACONIAN_ANNIHILATOR:
    case MONS_DRACONIAN_ZEALOT:
    case MONS_DRACONIAN_SHIFTER:
        return (500);
    default:
        return (0);
    }
}

Replacement in crawl-ref/source/enum.h at line 352 [6.3287960]

∅:D[12.11529] → [11.11304:11402]

B:BD[11.11304] → [11.11304:11402]

B:BD[11.11402] → [9.3019:3058]

    BRANCH_INFERNO,             // unimplemented
    BRANCH_THE_PIT,             // unimplemented
    BRANCH_LAST_HELL = BRANCH_THE_PIT,

[11.11304]

[13.2645]

    BRANCH_LAST_HELL = BRANCH_TARTARUS,

Deletion in crawl-ref/source/enum.h at line 354 [6.3287960]
∅:D[13.2669] → [11.11403:11452]
B:BD[6.3300176] → [11.11403:11452]
```
    BRANCH_CAVERNS,             // unimplemented
```
Replacement in crawl-ref/source/enum.h at line 1045 [6.3287960]
∅:D[4.1216] → [5.911767:911821]
∅:D[7.4387] → [5.911767:911821]
B:BD[5.911767] → [5.911767:911821]
B:BD[5.911821] → [14.2985:3031]
∅:D[14.3031] → [15.2733:2785]
B:BD[5.911868] → [15.2733:2785]
```
    DNGN_ENTER_RESERVED_2,
    DNGN_ENTER_RESERVED_3,
    DNGN_ENTER_RESERVED_4,             // 126
    DNGN_ENTER_LAST_BRANCH = DNGN_ENTER_RESERVED_4,
```
[4.1216]
[6.3309987]
```
    DNGN_ENTER_LAST_BRANCH = DNGN_ENTER_SHOALS,
```
Replacement in crawl-ref/source/enum.h at line 1062 [6.3287960]
B:BD[6.3310398] → [6.3310398:3310448]
```
    DNGN_RETURN_FROM_SWAMP,               //  142
```
[6.3310398]
[4.1217]
```
    DNGN_RETURN_FROM_SWAMP,            //  142
```
Replacement in crawl-ref/source/enum.h at line 1064 [6.3287960]
∅:D[4.1246] → [5.911897:911953]
∅:D[7.4418] → [5.911897:911953]
B:BD[5.911897] → [5.911897:911953]
B:BD[5.911953] → [16.29885:29932]
B:BD[16.29932] → [15.2977:3036]
```
    DNGN_RETURN_RESERVED_2,
    DNGN_RETURN_RESERVED_3,
    DNGN_RETURN_RESERVED_4,             // 146
    DNGN_RETURN_FROM_LAST_BRANCH = DNGN_RETURN_RESERVED_4,
```
[4.1246]
[16.29932]
```
    DNGN_RETURN_FROM_LAST_BRANCH = DNGN_RETURN_FROM_SHOALS,
```
Insertion in crawl-ref/source/database.cc at line 73 [19.13932]
[17.3064]
[18.2664]
```
            "descript/cards.txt",
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 108 [3.2804]
B:BD[3.5116] → [3.5116:5155]
```
This scroll reveals your surroundings.
```
[3.5116]
[3.5155]
```
This card reveals your surroundings.
```

Deletion in crawl-ref/source/dat/descript/cards.txt at line 232 [3.2804]

B:BD[3.7125] → [3.7125:7808]


    [ Part 3: "Attached Text" ]
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
    [ Part 4: "Attached Text" ]
_______________________________________________
Crawl-ref-discuss mailing list
Crawl-ref-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss

Insertion in crawl-ref/source/branch.cc at line 142 [11.14355]

[11.14560]

    // Branch struct:
    //  branch id, parent branch, depth, startdepth, branch flags, level flags
    //  entry stairs, exit stairs, short name, long name, abbrev name
    //  entry message
    //  has_shops, has_uniques, floor colour, rock colour
    //  mons rarity function, mons level function
    //  num_traps_function, rand_trap_function, num_fogs_function, rand_fog_function
    //  altar chance (in %), travel shortcut, upstairs exit branch, dangerous branch end

Deletion in crawl-ref/source/branch.cc at line 322 [11.14355]
∅:D[20.6063] → [11.19052:19053]
∅:D[21.24196] → [11.19052:19053]
∅:D[12.39021] → [11.19052:19053]
B:BD[11.19052] → [11.19052:19053]
B:BD[11.19053] → [22.130571:130628]
∅:D[22.130628] → [11.19104:19174]
B:BD[11.19104] → [11.19104:19174]
B:BD[11.19174] → [23.6357:6391]
B:BD[23.6391] → [24.2330:2348]
B:BD[24.2348] → [25.13493:13523]
∅:D[25.13523] → [21.24197:24227]
B:BD[24.2348] → [21.24197:24227]
```
    { BRANCH_INFERNO, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0,
      NUM_FEATURES, NUM_FEATURES,
      NULL, NULL, NULL,
      NULL,
      false, false, BLACK, BLACK,
      NULL, NULL,
      NULL, NULL, NULL, NULL,
      0, 'R', false, false },
```
Deletion in crawl-ref/source/branch.cc at line 323 [11.14355]
B:BD[11.19239] → [22.130629:130686]
∅:D[22.130686] → [11.19290:19360]
B:BD[11.19290] → [11.19290:19360]
B:BD[11.19360] → [23.6392:6426]
B:BD[23.6426] → [24.2349:2367]
B:BD[24.2367] → [25.13524:13554]
∅:D[25.13554] → [21.24228:24258]
B:BD[24.2367] → [21.24228:24258]
∅:D[20.6111] → [11.19424:19425]
∅:D[21.24258] → [11.19424:19425]
B:BD[11.19424] → [11.19424:19425]
```
    { BRANCH_THE_PIT, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0,
      NUM_FEATURES, NUM_FEATURES,
      NULL, NULL, NULL,
      NULL,
      false, false, BLACK, BLACK,
      NULL, NULL,
      NULL, NULL, NULL, NULL,
      0, '0', false, false },
```
Deletion in crawl-ref/source/branch.cc at line 331 [11.14355]
B:BD[13.3058] → [13.3058:3059]
∅:D[13.3059] → [22.130748:130805]
B:BD[11.19657] → [22.130748:130805]
∅:D[22.130805] → [11.19708:19778]
B:BD[11.19708] → [11.19708:19778]
B:BD[11.19778] → [23.6512:6546]
B:BD[23.6546] → [24.2414:2432]
B:BD[24.2432] → [25.13586:13616]
∅:D[25.13616] → [21.24289:24316]
B:BD[24.2432] → [21.24289:24316]
```
    { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0,
      NUM_FEATURES, NUM_FEATURES,
      NULL, NULL, NULL,
      NULL,
      false, false, BLACK, BLACK,
      NULL, NULL,
      NULL, NULL, NULL, NULL,
      0, 0, false, false }
```

Remove references to unimplemented branches (Caverns, Pit, Inferno).

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 4476 [6.16817]

Deletion in crawl-ref/source/view.cc at line 4506 [6.16817]

Deletion in crawl-ref/source/terrain.cc at line 129 [8.26938]

Deletion in crawl-ref/source/terrain.cc at line 164 [8.26938]

Replacement in crawl-ref/source/player.cc at line 399 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4349 [6.962854]

Deletion in crawl-ref/source/mon-pick.cc at line 2344 [6.1767507]

Deletion in crawl-ref/source/mon-pick.cc at line 2345 [6.1767507]

Deletion in crawl-ref/source/mon-pick.cc at line 2347 [6.1767507]

Replacement in crawl-ref/source/enum.h at line 352 [6.3287960]

Deletion in crawl-ref/source/enum.h at line 354 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 1045 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 1062 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 1064 [6.3287960]

Insertion in crawl-ref/source/database.cc at line 73 [19.13932]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 108 [3.2804]

Deletion in crawl-ref/source/dat/descript/cards.txt at line 232 [3.2804]

Insertion in crawl-ref/source/branch.cc at line 142 [11.14355]

Deletion in crawl-ref/source/branch.cc at line 322 [11.14355]

Deletion in crawl-ref/source/branch.cc at line 323 [11.14355]

Deletion in crawl-ref/source/branch.cc at line 331 [11.14355]